| 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 "base/synchronization/waitable_event.h" | 8 #include "base/synchronization/waitable_event.h" |
| 9 #include "chrome/browser/google/google_url_tracker.h" | 9 #include "chrome/browser/google/google_url_tracker.h" |
| 10 #include "chrome/browser/notifications/notification_ui_manager.h" | 10 #include "chrome/browser/notifications/notification_ui_manager.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 | 62 |
| 63 base::Thread* TestingBrowserProcess::gpu_thread() { | 63 base::Thread* TestingBrowserProcess::gpu_thread() { |
| 64 return NULL; | 64 return NULL; |
| 65 } | 65 } |
| 66 | 66 |
| 67 WatchDogThread* TestingBrowserProcess::watchdog_thread() { | 67 WatchDogThread* TestingBrowserProcess::watchdog_thread() { |
| 68 return NULL; | 68 return NULL; |
| 69 } | 69 } |
| 70 | 70 |
| 71 #if defined(OS_CHROMEOS) |
| 72 base::Thread* TestingBrowserProcess::webproxy_thread() { |
| 73 return NULL; |
| 74 } |
| 75 #endif |
| 76 |
| 71 ProfileManager* TestingBrowserProcess::profile_manager() { | 77 ProfileManager* TestingBrowserProcess::profile_manager() { |
| 72 return profile_manager_.get(); | 78 return profile_manager_.get(); |
| 73 } | 79 } |
| 74 | 80 |
| 75 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { | 81 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { |
| 76 profile_manager_.reset(profile_manager); | 82 profile_manager_.reset(profile_manager); |
| 77 } | 83 } |
| 78 | 84 |
| 79 PrefService* TestingBrowserProcess::local_state() { | 85 PrefService* TestingBrowserProcess::local_state() { |
| 80 return pref_service_; | 86 return pref_service_; |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 248 |
| 243 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 249 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
| 244 DCHECK_EQ(browser_process_.get(), g_browser_process); | 250 DCHECK_EQ(browser_process_.get(), g_browser_process); |
| 245 | 251 |
| 246 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 252 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
| 247 // After the transition is over, we should just | 253 // After the transition is over, we should just |
| 248 // reset |g_browser_process| to NULL. | 254 // reset |g_browser_process| to NULL. |
| 249 browser_process_.reset(); | 255 browser_process_.reset(); |
| 250 g_browser_process = new TestingBrowserProcess(); | 256 g_browser_process = new TestingBrowserProcess(); |
| 251 } | 257 } |
| OLD | NEW |