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

Side by Side Diff: chrome/browser/content_settings/content_settings_pref_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/content_settings/content_settings_policy_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_supervised_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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "components/content_settings/core/browser/content_settings_pref_provide r.h"	5 #include "components/content_settings/core/browser/content_settings_pref_provide r.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/message_loop/message_loop.h"	11 #include "base/message_loop/message_loop.h"

12 #include "base/prefs/default_pref_store.h"

13 #include "base/prefs/overlay_user_pref_store.h"

14 #include "base/prefs/pref_change_registrar.h"

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

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

17 #include "base/prefs/testing_pref_store.h"

18 #include "base/test/simple_test_clock.h"	12 #include "base/test/simple_test_clock.h"

19 #include "base/threading/platform_thread.h"	13 #include "base/threading/platform_thread.h"

20 #include "base/values.h"	14 #include "base/values.h"

21 #include "chrome/browser/content_settings/content_settings_mock_observer.h"	15 #include "chrome/browser/content_settings/content_settings_mock_observer.h"

22 #include "chrome/browser/prefs/browser_prefs.h"	16 #include "chrome/browser/prefs/browser_prefs.h"

23 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

24 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

25 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

26 #include "chrome/test/base/testing_profile.h"	20 #include "chrome/test/base/testing_profile.h"

27 #include "components/content_settings/core/browser/content_settings_pref.h"	21 #include "components/content_settings/core/browser/content_settings_pref.h"

28 #include "components/content_settings/core/browser/content_settings_registry.h"	22 #include "components/content_settings/core/browser/content_settings_registry.h"

29 #include "components/content_settings/core/browser/content_settings_rule.h"	23 #include "components/content_settings/core/browser/content_settings_rule.h"

30 #include "components/content_settings/core/browser/website_settings_info.h"	24 #include "components/content_settings/core/browser/website_settings_info.h"

31 #include "components/content_settings/core/browser/website_settings_registry.h"	25 #include "components/content_settings/core/browser/website_settings_registry.h"

32 #include "components/content_settings/core/common/content_settings_pattern.h"	26 #include "components/content_settings/core/common/content_settings_pattern.h"

33 #include "components/content_settings/core/test/content_settings_test_utils.h"	27 #include "components/content_settings/core/test/content_settings_test_utils.h"

34 #include "components/pref_registry/pref_registry_syncable.h"	28 #include "components/pref_registry/pref_registry_syncable.h"

	29 #include "components/prefs/default_pref_store.h"

	30 #include "components/prefs/overlay_user_pref_store.h"

	31 #include "components/prefs/pref_change_registrar.h"

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

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

	34 #include "components/prefs/testing_pref_store.h"

35 #include "components/syncable_prefs/pref_service_mock_factory.h"	35 #include "components/syncable_prefs/pref_service_mock_factory.h"

36 #include "components/syncable_prefs/pref_service_syncable.h"	36 #include "components/syncable_prefs/pref_service_syncable.h"

37 #include "components/syncable_prefs/testing_pref_service_syncable.h"	37 #include "components/syncable_prefs/testing_pref_service_syncable.h"

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

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

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

41	41

42 using ::testing::_;	42 using ::testing::_;

43	43

44 namespace content_settings {	44 namespace content_settings {

(...skipping 492 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
537 for (const char* pref : nonempty_prefs) {	537 for (const char* pref : nonempty_prefs) {

538 DictionaryPrefUpdate update(&prefs, pref);	538 DictionaryPrefUpdate update(&prefs, pref);

539 const base::DictionaryValue* dictionary = update.Get();	539 const base::DictionaryValue* dictionary = update.Get();

540 EXPECT_EQ(1u, dictionary->size());	540 EXPECT_EQ(1u, dictionary->size());

541 }	541 }

542	542

543 provider.ShutdownOnUIThread();	543 provider.ShutdownOnUIThread();

544 }	544 }

545	545

546 } // namespace content_settings	546 } // namespace content_settings

OLD	NEW