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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
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 "chrome/browser/content_settings/content_settings_pref_provider.h" 5 #include "chrome/browser/content_settings/content_settings_pref_provider.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.h" 10 #include "base/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_service.h"
13 #include "base/prefs/public/pref_change_registrar.h" 14 #include "base/prefs/public/pref_change_registrar.h"
14 #include "base/prefs/testing_pref_store.h" 15 #include "base/prefs/testing_pref_store.h"
15 #include "base/threading/platform_thread.h" 16 #include "base/threading/platform_thread.h"
16 #include "base/values.h" 17 #include "base/values.h"
17 #include "chrome/browser/content_settings/content_settings_mock_observer.h" 18 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
18 #include "chrome/browser/content_settings/content_settings_utils.h" 19 #include "chrome/browser/content_settings/content_settings_utils.h"
19 #include "chrome/browser/prefs/browser_prefs.h" 20 #include "chrome/browser/prefs/browser_prefs.h"
20 #include "chrome/browser/prefs/pref_registry_syncable.h" 21 #include "chrome/browser/prefs/pref_registry_syncable.h"
21 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/prefs/pref_service_mock_builder.h" 22 #include "chrome/browser/prefs/pref_service_mock_builder.h"
23 #include "chrome/browser/prefs/pref_service_syncable.h" 23 #include "chrome/browser/prefs/pref_service_syncable.h"
24 #include "chrome/browser/prefs/scoped_user_pref_update.h" 24 #include "chrome/browser/prefs/scoped_user_pref_update.h"
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
28 #include "chrome/test/base/testing_pref_service.h" 28 #include "chrome/test/base/testing_pref_service.h"
29 #include "chrome/test/base/testing_profile.h" 29 #include "chrome/test/base/testing_profile.h"
30 #include "content/public/test/test_browser_thread.h" 30 #include "content/public/test/test_browser_thread.h"
31 #include "googleurl/src/gurl.h" 31 #include "googleurl/src/gurl.h"
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 DictionaryValue* mutable_settings = update.Get(); 387 DictionaryValue* mutable_settings = update.Get();
388 mutable_settings->SetWithoutPathExpansion("www.example.com,*", 388 mutable_settings->SetWithoutPathExpansion("www.example.com,*",
389 new base::DictionaryValue()); 389 new base::DictionaryValue());
390 } 390 }
391 EXPECT_TRUE(observer.notification_received()); 391 EXPECT_TRUE(observer.notification_received());
392 392
393 provider.ShutdownOnUIThread(); 393 provider.ShutdownOnUIThread();
394 } 394 }
395 395
396 } // namespace content_settings 396 } // namespace content_settings
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/content_settings/cookie_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698