Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(865)

Side by Side Diff: chrome/test/testing_browser_process.cc

Issue 6992081: Make --allow-cross-domain-auth-prompt equivalent to a preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 } 225 }
226 226
227 base::WaitableEvent* TestingBrowserProcess::shutdown_event() { 227 base::WaitableEvent* TestingBrowserProcess::shutdown_event() {
228 return shutdown_event_.get(); 228 return shutdown_event_.get();
229 } 229 }
230 230
231 bool TestingBrowserProcess::plugin_finder_disabled() const { 231 bool TestingBrowserProcess::plugin_finder_disabled() const {
232 return false; 232 return false;
233 } 233 }
234 234
235 bool TestingBrowserProcess::allow_cross_origin_auth_prompt() const {
236 return false;
237 }
238
235 ChromeNetLog* TestingBrowserProcess::net_log() { 239 ChromeNetLog* TestingBrowserProcess::net_log() {
236 return NULL; 240 return NULL;
237 } 241 }
238 242
239 void TestingBrowserProcess::SetLocalState(PrefService* local_state) { 243 void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
240 local_state_ = local_state; 244 local_state_ = local_state;
241 } 245 }
242 246
243 void TestingBrowserProcess::SetGoogleURLTracker( 247 void TestingBrowserProcess::SetGoogleURLTracker(
244 GoogleURLTracker* google_url_tracker) { 248 GoogleURLTracker* google_url_tracker) {
(...skipping 15 matching lines...) Expand all
260 264
261 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { 265 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
262 DCHECK_EQ(browser_process_.get(), g_browser_process); 266 DCHECK_EQ(browser_process_.get(), g_browser_process);
263 267
264 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. 268 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
265 // After the transition is over, we should just 269 // After the transition is over, we should just
266 // reset |g_browser_process| to NULL. 270 // reset |g_browser_process| to NULL.
267 browser_process_.reset(); 271 browser_process_.reset();
268 g_browser_process = new TestingBrowserProcess(); 272 g_browser_process = new TestingBrowserProcess();
269 } 273 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698