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

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More IWYU, missing link-time dependency for Chrome Frame. Created 9 years, 1 month 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) 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 "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/threading/platform_thread.h" 11 #include "base/threading/platform_thread.h"
11 #include "chrome/browser/content_settings/content_settings_mock_observer.h" 12 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
12 #include "chrome/browser/content_settings/content_settings_utils.h" 13 #include "chrome/browser/content_settings/content_settings_utils.h"
13 #include "chrome/browser/prefs/browser_prefs.h" 14 #include "chrome/browser/prefs/browser_prefs.h"
14 #include "chrome/browser/prefs/default_pref_store.h" 15 #include "chrome/browser/prefs/default_pref_store.h"
15 #include "chrome/browser/prefs/incognito_user_pref_store.h" 16 #include "chrome/browser/prefs/incognito_user_pref_store.h"
16 #include "chrome/browser/prefs/pref_change_registrar.h" 17 #include "chrome/browser/prefs/pref_change_registrar.h"
17 #include "chrome/browser/prefs/pref_service.h" 18 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/prefs/pref_service_mock_builder.h" 19 #include "chrome/browser/prefs/pref_service_mock_builder.h"
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" 20 #include "chrome/browser/prefs/scoped_user_pref_update.h"
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 DictionaryValue* mutable_settings = update.Get(); 872 DictionaryValue* mutable_settings = update.Get();
872 mutable_settings->SetWithoutPathExpansion("www.example.com,*", 873 mutable_settings->SetWithoutPathExpansion("www.example.com,*",
873 new base::DictionaryValue()); 874 new base::DictionaryValue());
874 } 875 }
875 EXPECT_TRUE(observer.notification_received()); 876 EXPECT_TRUE(observer.notification_received());
876 877
877 provider.ShutdownOnUIThread(); 878 provider.ShutdownOnUIThread();
878 } 879 }
879 880
880 } // namespace content_settings 881 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698