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/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 } | 177 } |
178 | 178 |
179 base::WaitableEvent* TestingBrowserProcess::shutdown_event() { | 179 base::WaitableEvent* TestingBrowserProcess::shutdown_event() { |
180 return shutdown_event_.get(); | 180 return shutdown_event_.get(); |
181 } | 181 } |
182 | 182 |
183 bool TestingBrowserProcess::have_inspector_files() const { | 183 bool TestingBrowserProcess::have_inspector_files() const { |
184 return true; | 184 return true; |
185 } | 185 } |
186 | 186 |
| 187 ChromeNetLog* TestingBrowserProcess::net_log() { |
| 188 return NULL; |
| 189 } |
| 190 |
187 void TestingBrowserProcess::SetPrefService(PrefService* pref_service) { | 191 void TestingBrowserProcess::SetPrefService(PrefService* pref_service) { |
188 pref_service_ = pref_service; | 192 pref_service_ = pref_service; |
189 } | 193 } |
190 | 194 |
191 void TestingBrowserProcess::SetGoogleURLTracker( | 195 void TestingBrowserProcess::SetGoogleURLTracker( |
192 GoogleURLTracker* google_url_tracker) { | 196 GoogleURLTracker* google_url_tracker) { |
193 google_url_tracker_.reset(google_url_tracker); | 197 google_url_tracker_.reset(google_url_tracker); |
194 } | 198 } |
195 | 199 |
196 ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() { | 200 ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() { |
(...skipping 11 matching lines...) Expand all Loading... |
208 | 212 |
209 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { | 213 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { |
210 DCHECK_EQ(browser_process_.get(), g_browser_process); | 214 DCHECK_EQ(browser_process_.get(), g_browser_process); |
211 | 215 |
212 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. | 216 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
213 // After the transition is over, we should just | 217 // After the transition is over, we should just |
214 // reset |g_browser_process| to NULL. | 218 // reset |g_browser_process| to NULL. |
215 browser_process_.reset(); | 219 browser_process_.reset(); |
216 g_browser_process = new TestingBrowserProcess(); | 220 g_browser_process = new TestingBrowserProcess(); |
217 } | 221 } |
OLD | NEW |