OLD | NEW |
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 Loading... |
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 ComponentUpdateService* TestingBrowserProcess::component_updater() { |
| 247 return NULL; |
| 248 } |
| 249 |
246 void TestingBrowserProcess::SetLocalState(PrefService* local_state) { | 250 void TestingBrowserProcess::SetLocalState(PrefService* local_state) { |
247 if (!local_state && notification_ui_manager_.get()) | 251 if (!local_state && notification_ui_manager_.get()) |
248 notification_ui_manager_.reset(); // Used local_state_. | 252 notification_ui_manager_.reset(); // Used local_state_. |
249 local_state_ = local_state; | 253 local_state_ = local_state; |
250 } | 254 } |
251 | 255 |
252 void TestingBrowserProcess::SetGoogleURLTracker( | 256 void TestingBrowserProcess::SetGoogleURLTracker( |
253 GoogleURLTracker* google_url_tracker) { | 257 GoogleURLTracker* google_url_tracker) { |
254 google_url_tracker_.reset(google_url_tracker); | 258 google_url_tracker_.reset(google_url_tracker); |
255 } | 259 } |
(...skipping 17 matching lines...) Expand all Loading... |
273 | 277 |
274 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 278 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
275 DCHECK_EQ(browser_process_.get(), g_browser_process); | 279 DCHECK_EQ(browser_process_.get(), g_browser_process); |
276 | 280 |
277 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 281 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
278 // After the transition is over, we should just | 282 // After the transition is over, we should just |
279 // reset |g_browser_process| to NULL. | 283 // reset |g_browser_process| to NULL. |
280 browser_process_.reset(); | 284 browser_process_.reset(); |
281 g_browser_process = new TestingBrowserProcess(); | 285 g_browser_process = new TestingBrowserProcess(); |
282 } | 286 } |
OLD | NEW |