| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 } | 117 } |
| 118 | 118 |
| 119 SidebarManager* TestingBrowserProcess::sidebar_manager() { | 119 SidebarManager* TestingBrowserProcess::sidebar_manager() { |
| 120 return NULL; | 120 return NULL; |
| 121 } | 121 } |
| 122 | 122 |
| 123 TabCloseableStateWatcher* TestingBrowserProcess::tab_closeable_state_watcher() { | 123 TabCloseableStateWatcher* TestingBrowserProcess::tab_closeable_state_watcher() { |
| 124 return NULL; | 124 return NULL; |
| 125 } | 125 } |
| 126 | 126 |
| 127 BackgroundModeManager* TestingBrowserProcess::background_mode_manager() { | |
| 128 return NULL; | |
| 129 } | |
| 130 | |
| 131 StatusTray* TestingBrowserProcess::status_tray() { | |
| 132 return NULL; | |
| 133 } | |
| 134 | |
| 135 safe_browsing::ClientSideDetectionService* | 127 safe_browsing::ClientSideDetectionService* |
| 136 TestingBrowserProcess::safe_browsing_detection_service() { | 128 TestingBrowserProcess::safe_browsing_detection_service() { |
| 137 return NULL; | 129 return NULL; |
| 138 } | 130 } |
| 139 | 131 |
| 140 net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() { | 132 net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() { |
| 141 return NULL; | 133 return NULL; |
| 142 } | 134 } |
| 143 | 135 |
| 144 #if defined(OS_CHROMEOS) | 136 #if defined(OS_CHROMEOS) |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 | 267 |
| 276 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 268 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
| 277 DCHECK_EQ(browser_process_.get(), g_browser_process); | 269 DCHECK_EQ(browser_process_.get(), g_browser_process); |
| 278 | 270 |
| 279 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 271 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
| 280 // After the transition is over, we should just | 272 // After the transition is over, we should just |
| 281 // reset |g_browser_process| to NULL. | 273 // reset |g_browser_process| to NULL. |
| 282 browser_process_.reset(); | 274 browser_process_.reset(); |
| 283 g_browser_process = new TestingBrowserProcess(); | 275 g_browser_process = new TestingBrowserProcess(); |
| 284 } | 276 } |
| OLD | NEW |