chrome/browser/content_settings/content_settings_default_provider_unittest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/content_settings/content_settings_default_provider_unittest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/component_updater/sw_reporter_installer_win.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/message_loop.h"	6 #include "base/message_loop/message_loop.h"

7 #include "base/prefs/pref_service.h"

8 #include "base/prefs/scoped_user_pref_update.h"

9 #include "base/prefs/testing_pref_service.h"

10 #include "chrome/browser/content_settings/content_settings_mock_observer.h"	7 #include "chrome/browser/content_settings/content_settings_mock_observer.h"

11 #include "chrome/common/pref_names.h"	8 #include "chrome/common/pref_names.h"

12 #include "chrome/test/base/testing_profile.h"	9 #include "chrome/test/base/testing_profile.h"

13 #include "components/content_settings/core/browser/content_settings_default_prov ider.h"	10 #include "components/content_settings/core/browser/content_settings_default_prov ider.h"

14 #include "components/content_settings/core/browser/content_settings_utils.h"	11 #include "components/content_settings/core/browser/content_settings_utils.h"

15 #include "components/content_settings/core/browser/website_settings_info.h"	12 #include "components/content_settings/core/browser/website_settings_info.h"

16 #include "components/content_settings/core/browser/website_settings_registry.h"	13 #include "components/content_settings/core/browser/website_settings_registry.h"

17 #include "components/content_settings/core/test/content_settings_test_utils.h"	14 #include "components/content_settings/core/test/content_settings_test_utils.h"

	15 #include "components/prefs/pref_service.h"

	16 #include "components/prefs/scoped_user_pref_update.h"

	17 #include "components/prefs/testing_pref_service.h"

18 #include "content/public/test/test_browser_thread_bundle.h"	18 #include "content/public/test/test_browser_thread_bundle.h"

19 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

20 #include "url/gurl.h"	20 #include "url/gurl.h"

21	21

22 using ::testing::_;	22 using ::testing::_;

23	23

24 namespace content_settings {	24 namespace content_settings {

25	25

26 class DefaultProviderTest : public testing::Test {	26 class DefaultProviderTest : public testing::Test {

27 public:	27 public:

(...skipping 178 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
206 EXPECT_EQ(CONTENT_SETTING_BLOCK,	206 EXPECT_EQ(CONTENT_SETTING_BLOCK,

207 TestUtils::GetContentSetting(	207 TestUtils::GetContentSetting(

208 &otr_provider2, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,	208 &otr_provider2, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,

209 std::string(), true /* include_incognito */));	209 std::string(), true /* include_incognito */));

210	210

211 otr_provider.ShutdownOnUIThread();	211 otr_provider.ShutdownOnUIThread();

212 otr_provider2.ShutdownOnUIThread();	212 otr_provider2.ShutdownOnUIThread();

213 }	213 }

214	214

215 } // namespace content_settings	215 } // namespace content_settings

OLD	NEW