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

Side by Side Diff: chrome/test/testing_browser_process.cc

Issue 7545004: Component update (part 6), wire sigleton to browser (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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) 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/test/testing_browser_process.h" 5 #include "chrome/test/testing_browser_process.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/google/google_url_tracker.h" 8 #include "chrome/browser/google/google_url_tracker.h"
9 #include "chrome/browser/notifications/notification_ui_manager.h" 9 #include "chrome/browser/notifications/notification_ui_manager.h"
10 #include "chrome/browser/policy/browser_policy_connector.h" 10 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 237
238 MHTMLGenerationManager* TestingBrowserProcess::mhtml_generation_manager() { 238 MHTMLGenerationManager* TestingBrowserProcess::mhtml_generation_manager() {
239 return NULL; 239 return NULL;
240 } 240 }
241 241
242 GpuBlacklistUpdater* TestingBrowserProcess::gpu_blacklist_updater() { 242 GpuBlacklistUpdater* TestingBrowserProcess::gpu_blacklist_updater() {
243 return NULL; 243 return NULL;
244 } 244 }
245 245
246 #if !defined(OS_CHROMEOS)
247 ComponentUpdateService* TestingBrowserProcess::component_updater() {
248 return NULL;
249 }
250 #endif
251
246 void TestingBrowserProcess::SetLocalState(PrefService* local_state) { 252 void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
247 if (!local_state && notification_ui_manager_.get()) 253 if (!local_state && notification_ui_manager_.get())
248 notification_ui_manager_.reset(); // Used local_state_. 254 notification_ui_manager_.reset(); // Used local_state_.
249 local_state_ = local_state; 255 local_state_ = local_state;
250 } 256 }
251 257
252 void TestingBrowserProcess::SetGoogleURLTracker( 258 void TestingBrowserProcess::SetGoogleURLTracker(
253 GoogleURLTracker* google_url_tracker) { 259 GoogleURLTracker* google_url_tracker) {
254 google_url_tracker_.reset(google_url_tracker); 260 google_url_tracker_.reset(google_url_tracker);
255 } 261 }
(...skipping 17 matching lines...) Expand all
273 279
274 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { 280 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
275 DCHECK_EQ(browser_process_.get(), g_browser_process); 281 DCHECK_EQ(browser_process_.get(), g_browser_process);
276 282
277 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. 283 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
278 // After the transition is over, we should just 284 // After the transition is over, we should just
279 // reset |g_browser_process| to NULL. 285 // reset |g_browser_process| to NULL.
280 browser_process_.reset(); 286 browser_process_.reset();
281 g_browser_process = new TestingBrowserProcess(); 287 g_browser_process = new TestingBrowserProcess();
282 } 288 }
OLDNEW
« chrome/common/chrome_switches.cc ('K') | « chrome/test/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698