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

Unified Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 297513010: [abort] [do not submit] fiddle with test runner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/test_runner/web_test_proxy.cc
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
index 58dd26c3ef9bb87d7dd51bf6ab262f18cec48b54..1a7c1f7834ad3d26dee0ebe7e2afe3016508d249 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.cc
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc
@@ -766,6 +766,8 @@ void WebTestProxyBase::LoadURLExternally(WebLocalFrame* frame,
void WebTestProxyBase::DidStartProvisionalLoad(WebLocalFrame* frame) {
if (!test_interfaces_->testRunner()->topLoadingFrame())
test_interfaces_->testRunner()->setTopLoadingFrame(frame, false);
+ else
+ LocationChangeDone(frame);
if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
printFrameDescription(delegate_, frame);
@@ -1067,7 +1069,7 @@ void WebTestProxyBase::LocationChangeDone(WebFrame* frame) {
}
WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation(
- WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest& request,
+ WebLocalFrame* frame, WebDataSource::ExtraData*, const WebURLRequest& request,
WebNavigationType type, WebNavigationPolicy defaultPolicy,
bool isRedirect) {
WebNavigationPolicy result;
« no previous file with comments | « content/browser/web_contents/web_contents_impl_browsertest.cc ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698