| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 56 } |
| 57 | 57 |
| 58 base::Thread* TestingBrowserProcess::db_thread() { | 58 base::Thread* TestingBrowserProcess::db_thread() { |
| 59 return NULL; | 59 return NULL; |
| 60 } | 60 } |
| 61 | 61 |
| 62 base::Thread* TestingBrowserProcess::cache_thread() { | 62 base::Thread* TestingBrowserProcess::cache_thread() { |
| 63 return NULL; | 63 return NULL; |
| 64 } | 64 } |
| 65 | 65 |
| 66 base::Thread* TestingBrowserProcess::gpu_thread() { | |
| 67 return NULL; | |
| 68 } | |
| 69 | |
| 70 WatchDogThread* TestingBrowserProcess::watchdog_thread() { | 66 WatchDogThread* TestingBrowserProcess::watchdog_thread() { |
| 71 return NULL; | 67 return NULL; |
| 72 } | 68 } |
| 73 | 69 |
| 74 #if defined(OS_CHROMEOS) | 70 #if defined(OS_CHROMEOS) |
| 75 base::Thread* TestingBrowserProcess::web_socket_proxy_thread() { | 71 base::Thread* TestingBrowserProcess::web_socket_proxy_thread() { |
| 76 return NULL; | 72 return NULL; |
| 77 } | 73 } |
| 78 #endif | 74 #endif |
| 79 | 75 |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 256 |
| 261 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 257 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
| 262 DCHECK_EQ(browser_process_.get(), g_browser_process); | 258 DCHECK_EQ(browser_process_.get(), g_browser_process); |
| 263 | 259 |
| 264 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 260 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
| 265 // After the transition is over, we should just | 261 // After the transition is over, we should just |
| 266 // reset |g_browser_process| to NULL. | 262 // reset |g_browser_process| to NULL. |
| 267 browser_process_.reset(); | 263 browser_process_.reset(); |
| 268 g_browser_process = new TestingBrowserProcess(); | 264 g_browser_process = new TestingBrowserProcess(); |
| 269 } | 265 } |
| OLD | NEW |