OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
| 7 #include "base/prefs/pref_service.h" |
7 #include "chrome/browser/content_settings/content_settings_default_provider.h" | 8 #include "chrome/browser/content_settings/content_settings_default_provider.h" |
8 #include "chrome/browser/content_settings/content_settings_mock_observer.h" | 9 #include "chrome/browser/content_settings/content_settings_mock_observer.h" |
9 #include "chrome/browser/content_settings/content_settings_utils.h" | 10 #include "chrome/browser/content_settings/content_settings_utils.h" |
10 #include "chrome/browser/prefs/pref_service.h" | |
11 #include "chrome/common/pref_names.h" | 11 #include "chrome/common/pref_names.h" |
12 #include "chrome/test/base/testing_pref_service.h" | 12 #include "chrome/test/base/testing_pref_service.h" |
13 #include "chrome/test/base/testing_profile.h" | 13 #include "chrome/test/base/testing_profile.h" |
14 #include "content/public/test/test_browser_thread.h" | 14 #include "content/public/test/test_browser_thread.h" |
15 #include "googleurl/src/gurl.h" | 15 #include "googleurl/src/gurl.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
17 | 17 |
18 using ::testing::_; | 18 using ::testing::_; |
19 using content::BrowserThread; | 19 using content::BrowserThread; |
20 | 20 |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 | 250 |
251 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 251 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
252 GetContentSetting(&otr_provider, | 252 GetContentSetting(&otr_provider, |
253 GURL(), | 253 GURL(), |
254 GURL(), | 254 GURL(), |
255 CONTENT_SETTINGS_TYPE_COOKIES, | 255 CONTENT_SETTINGS_TYPE_COOKIES, |
256 std::string(), | 256 std::string(), |
257 true)); | 257 true)); |
258 otr_provider.ShutdownOnUIThread(); | 258 otr_provider.ShutdownOnUIThread(); |
259 } | 259 } |
OLD | NEW |