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

Side by Side Diff: chrome/browser/prefs/pref_service_mock_builder.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/prefs/pref_service_mock_builder.h" 5 #include "chrome/browser/prefs/pref_service_mock_builder.h"
6 6
7 #include "base/message_loop_proxy.h"
7 #include "chrome/browser/policy/configuration_policy_pref_store.h" 8 #include "chrome/browser/policy/configuration_policy_pref_store.h"
8 #include "chrome/browser/prefs/command_line_pref_store.h" 9 #include "chrome/browser/prefs/command_line_pref_store.h"
9 #include "chrome/browser/prefs/default_pref_store.h" 10 #include "chrome/browser/prefs/default_pref_store.h"
10 #include "chrome/browser/prefs/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/prefs/testing_pref_store.h" 12 #include "chrome/browser/prefs/testing_pref_store.h"
12 #include "chrome/common/json_pref_store.h" 13 #include "chrome/common/json_pref_store.h"
13 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
14 15
15 using content::BrowserThread; 16 using content::BrowserThread;
16 17
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 managed_platform_prefs_ = NULL; 123 managed_platform_prefs_ = NULL;
123 managed_cloud_prefs_ = NULL; 124 managed_cloud_prefs_ = NULL;
124 extension_prefs_ = NULL; 125 extension_prefs_ = NULL;
125 command_line_prefs_ = NULL; 126 command_line_prefs_ = NULL;
126 user_prefs_ = NULL; 127 user_prefs_ = NULL;
127 recommended_platform_prefs_ = NULL; 128 recommended_platform_prefs_ = NULL;
128 recommended_cloud_prefs_ = NULL; 129 recommended_cloud_prefs_ = NULL;
129 user_prefs_ = new TestingPrefStore; 130 user_prefs_ = new TestingPrefStore;
130 return pref_service; 131 return pref_service;
131 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698