| 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/policy/browser_policy_connector.h" | 10 #include "chrome/browser/policy/browser_policy_connector.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 } | 51 } |
| 52 | 52 |
| 53 base::Thread* TestingBrowserProcess::db_thread() { | 53 base::Thread* TestingBrowserProcess::db_thread() { |
| 54 return NULL; | 54 return NULL; |
| 55 } | 55 } |
| 56 | 56 |
| 57 base::Thread* TestingBrowserProcess::cache_thread() { | 57 base::Thread* TestingBrowserProcess::cache_thread() { |
| 58 return NULL; | 58 return NULL; |
| 59 } | 59 } |
| 60 | 60 |
| 61 WatchDogThread* TestingBrowserProcess::watchdog_thread() { |
| 62 return NULL; |
| 63 } |
| 64 |
| 61 ProfileManager* TestingBrowserProcess::profile_manager() { | 65 ProfileManager* TestingBrowserProcess::profile_manager() { |
| 62 return profile_manager_.get(); | 66 return profile_manager_.get(); |
| 63 } | 67 } |
| 64 | 68 |
| 65 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { | 69 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { |
| 66 profile_manager_.reset(profile_manager); | 70 profile_manager_.reset(profile_manager); |
| 67 } | 71 } |
| 68 | 72 |
| 69 PrefService* TestingBrowserProcess::local_state() { | 73 PrefService* TestingBrowserProcess::local_state() { |
| 70 return pref_service_; | 74 return pref_service_; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 | 221 |
| 218 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 222 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
| 219 DCHECK_EQ(browser_process_.get(), g_browser_process); | 223 DCHECK_EQ(browser_process_.get(), g_browser_process); |
| 220 | 224 |
| 221 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 225 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
| 222 // After the transition is over, we should just | 226 // After the transition is over, we should just |
| 223 // reset |g_browser_process| to NULL. | 227 // reset |g_browser_process| to NULL. |
| 224 browser_process_.reset(); | 228 browser_process_.reset(); |
| 225 g_browser_process = new TestingBrowserProcess(); | 229 g_browser_process = new TestingBrowserProcess(); |
| 226 } | 230 } |
| OLD | NEW |