Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1136)

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

Issue 1305213009: Componentize PrefSyncableService and support classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable
Patch Set: Add missing dependency on //sync:test_support_sync_api for unit tests with gn Created 5 years, 3 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
OLDNEW
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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/default_pref_store.h" 11 #include "base/prefs/default_pref_store.h"
12 #include "base/prefs/overlay_user_pref_store.h" 12 #include "base/prefs/overlay_user_pref_store.h"
13 #include "base/prefs/pref_change_registrar.h" 13 #include "base/prefs/pref_change_registrar.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/prefs/scoped_user_pref_update.h" 15 #include "base/prefs/scoped_user_pref_update.h"
16 #include "base/prefs/testing_pref_store.h" 16 #include "base/prefs/testing_pref_store.h"
17 #include "base/test/simple_test_clock.h" 17 #include "base/test/simple_test_clock.h"
18 #include "base/threading/platform_thread.h" 18 #include "base/threading/platform_thread.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/content_settings/content_settings_mock_observer.h" 20 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
21 #include "chrome/browser/prefs/browser_prefs.h" 21 #include "chrome/browser/prefs/browser_prefs.h"
22 #include "chrome/browser/prefs/pref_service_mock_factory.h"
23 #include "chrome/browser/prefs/pref_service_syncable.h"
24 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
27 #include "chrome/test/base/testing_pref_service_syncable.h"
28 #include "chrome/test/base/testing_profile.h" 25 #include "chrome/test/base/testing_profile.h"
29 #include "components/content_settings/core/browser/content_settings_pref.h" 26 #include "components/content_settings/core/browser/content_settings_pref.h"
30 #include "components/content_settings/core/browser/content_settings_registry.h" 27 #include "components/content_settings/core/browser/content_settings_registry.h"
31 #include "components/content_settings/core/browser/content_settings_rule.h" 28 #include "components/content_settings/core/browser/content_settings_rule.h"
32 #include "components/content_settings/core/browser/website_settings_info.h" 29 #include "components/content_settings/core/browser/website_settings_info.h"
33 #include "components/content_settings/core/browser/website_settings_registry.h" 30 #include "components/content_settings/core/browser/website_settings_registry.h"
34 #include "components/content_settings/core/common/content_settings_pattern.h" 31 #include "components/content_settings/core/common/content_settings_pattern.h"
35 #include "components/content_settings/core/test/content_settings_test_utils.h" 32 #include "components/content_settings/core/test/content_settings_test_utils.h"
36 #include "components/pref_registry/pref_registry_syncable.h" 33 #include "components/pref_registry/pref_registry_syncable.h"
34 #include "components/syncable_prefs/pref_service_mock_factory.h"
35 #include "components/syncable_prefs/pref_service_syncable.h"
36 #include "components/syncable_prefs/testing_pref_service_syncable.h"
37 #include "content/public/test/test_browser_thread_bundle.h" 37 #include "content/public/test/test_browser_thread_bundle.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 #include "url/gurl.h" 39 #include "url/gurl.h"
40 40
41 using ::testing::_; 41 using ::testing::_;
42 42
43 namespace content_settings { 43 namespace content_settings {
44 44
45 class DeadlockCheckerThread : public base::PlatformThread::Delegate { 45 class DeadlockCheckerThread : public base::PlatformThread::Delegate {
46 public: 46 public:
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 for (const char* pref : nonempty_prefs) { 616 for (const char* pref : nonempty_prefs) {
617 DictionaryPrefUpdate update(&prefs, pref); 617 DictionaryPrefUpdate update(&prefs, pref);
618 const base::DictionaryValue* dictionary = update.Get(); 618 const base::DictionaryValue* dictionary = update.Get();
619 EXPECT_EQ(1u, dictionary->size()); 619 EXPECT_EQ(1u, dictionary->size());
620 } 620 }
621 621
622 provider.ShutdownOnUIThread(); 622 provider.ShutdownOnUIThread();
623 } 623 }
624 624
625 } // namespace content_settings 625 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698