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