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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 } | 64 } |
65 | 65 |
66 base::Thread* TestingBrowserProcess::gpu_thread() { | 66 base::Thread* TestingBrowserProcess::gpu_thread() { |
67 return NULL; | 67 return NULL; |
68 } | 68 } |
69 | 69 |
70 WatchDogThread* TestingBrowserProcess::watchdog_thread() { | 70 WatchDogThread* TestingBrowserProcess::watchdog_thread() { |
71 return NULL; | 71 return NULL; |
72 } | 72 } |
73 | 73 |
| 74 #if defined(OS_CHROMEOS) |
| 75 base::Thread* TestingBrowserProcess::web_socket_proxy_thread() { |
| 76 return NULL; |
| 77 } |
| 78 #endif |
| 79 |
74 ProfileManager* TestingBrowserProcess::profile_manager() { | 80 ProfileManager* TestingBrowserProcess::profile_manager() { |
75 return profile_manager_.get(); | 81 return profile_manager_.get(); |
76 } | 82 } |
77 | 83 |
78 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { | 84 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { |
79 profile_manager_.reset(profile_manager); | 85 profile_manager_.reset(profile_manager); |
80 } | 86 } |
81 | 87 |
82 PrefService* TestingBrowserProcess::local_state() { | 88 PrefService* TestingBrowserProcess::local_state() { |
83 return local_state_; | 89 return local_state_; |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 | 260 |
255 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 261 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
256 DCHECK_EQ(browser_process_.get(), g_browser_process); | 262 DCHECK_EQ(browser_process_.get(), g_browser_process); |
257 | 263 |
258 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 264 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
259 // After the transition is over, we should just | 265 // After the transition is over, we should just |
260 // reset |g_browser_process| to NULL. | 266 // reset |g_browser_process| to NULL. |
261 browser_process_.reset(); | 267 browser_process_.reset(); |
262 g_browser_process = new TestingBrowserProcess(); | 268 g_browser_process = new TestingBrowserProcess(); |
263 } | 269 } |
OLD | NEW |