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

Side by Side Diff: content/browser/cross_site_transfer_browsertest.cc

Issue 803813003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 #include "content/public/browser/navigation_entry.h" 8 #include "content/public/browser/navigation_entry.h"
9 #include "content/public/browser/resource_dispatcher_host_delegate.h" 9 #include "content/public/browser/resource_dispatcher_host_delegate.h"
10 #include "content/public/browser/resource_throttle.h" 10 #include "content/public/browser/resource_throttle.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 script = base::StringPrintf("location.replace('%s')", url.spec().c_str()); 197 script = base::StringPrintf("location.replace('%s')", url.spec().c_str());
198 else 198 else
199 script = base::StringPrintf("location.href = '%s'", url.spec().c_str()); 199 script = base::StringPrintf("location.href = '%s'", url.spec().c_str());
200 TestNavigationObserver load_observer(shell()->web_contents(), 1); 200 TestNavigationObserver load_observer(shell()->web_contents(), 1);
201 bool result = ExecuteScript(window->web_contents(), script); 201 bool result = ExecuteScript(window->web_contents(), script);
202 EXPECT_TRUE(result); 202 EXPECT_TRUE(result);
203 if (should_wait_for_navigation) 203 if (should_wait_for_navigation)
204 load_observer.Wait(); 204 load_observer.Wait();
205 } 205 }
206 206
207 void SetUpCommandLine(CommandLine* command_line) override { 207 void SetUpCommandLine(base::CommandLine* command_line) override {
208 // Use --site-per-process to force process swaps for cross-site transfers. 208 // Use --site-per-process to force process swaps for cross-site transfers.
209 command_line->AppendSwitch(switches::kSitePerProcess); 209 command_line->AppendSwitch(switches::kSitePerProcess);
210 } 210 }
211 211
212 void InjectResourceDisptcherHostDelegate() { 212 void InjectResourceDisptcherHostDelegate() {
213 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 213 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
214 old_delegate_ = ResourceDispatcherHostImpl::Get()->delegate(); 214 old_delegate_ = ResourceDispatcherHostImpl::Get()->delegate();
215 ResourceDispatcherHostImpl::Get()->SetDelegate(&tracking_delegate_); 215 ResourceDispatcherHostImpl::Get()->SetDelegate(&tracking_delegate_);
216 } 216 }
217 217
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 EXPECT_EQ(0, controller.GetCurrentEntryIndex()); 453 EXPECT_EQ(0, controller.GetCurrentEntryIndex());
454 EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL()); 454 EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL());
455 455
456 // Make sure the request for url2 did not complete. 456 // Make sure the request for url2 did not complete.
457 EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted()); 457 EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted());
458 458
459 shell()->web_contents()->SetDelegate(old_delegate); 459 shell()->web_contents()->SetDelegate(old_delegate);
460 } 460 }
461 461
462 } // namespace content 462 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/device_sensors/device_inertial_sensor_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698