| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 } | 174 } |
| 175 | 175 |
| 176 DownloadStatusUpdater* TestingBrowserProcess::download_status_updater() { | 176 DownloadStatusUpdater* TestingBrowserProcess::download_status_updater() { |
| 177 return NULL; | 177 return NULL; |
| 178 } | 178 } |
| 179 | 179 |
| 180 base::WaitableEvent* TestingBrowserProcess::shutdown_event() { | 180 base::WaitableEvent* TestingBrowserProcess::shutdown_event() { |
| 181 return shutdown_event_.get(); | 181 return shutdown_event_.get(); |
| 182 } | 182 } |
| 183 | 183 |
| 184 bool TestingBrowserProcess::plugin_finder_disabled() const { |
| 185 return false; |
| 186 } |
| 187 |
| 184 bool TestingBrowserProcess::have_inspector_files() const { | 188 bool TestingBrowserProcess::have_inspector_files() const { |
| 185 return true; | 189 return true; |
| 186 } | 190 } |
| 187 | 191 |
| 188 ChromeNetLog* TestingBrowserProcess::net_log() { | 192 ChromeNetLog* TestingBrowserProcess::net_log() { |
| 189 return NULL; | 193 return NULL; |
| 190 } | 194 } |
| 191 | 195 |
| 192 void TestingBrowserProcess::SetPrefService(PrefService* pref_service) { | 196 void TestingBrowserProcess::SetPrefService(PrefService* pref_service) { |
| 193 pref_service_ = pref_service; | 197 pref_service_ = pref_service; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 213 | 217 |
| 214 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 218 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
| 215 DCHECK_EQ(browser_process_.get(), g_browser_process); | 219 DCHECK_EQ(browser_process_.get(), g_browser_process); |
| 216 | 220 |
| 217 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 221 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
| 218 // After the transition is over, we should just | 222 // After the transition is over, we should just |
| 219 // reset |g_browser_process| to NULL. | 223 // reset |g_browser_process| to NULL. |
| 220 browser_process_.reset(); | 224 browser_process_.reset(); |
| 221 g_browser_process = new TestingBrowserProcess(); | 225 g_browser_process = new TestingBrowserProcess(); |
| 222 } | 226 } |
| OLD | NEW |