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

Unified Diff: components/test_runner/web_frame_test_proxy.h

Issue 1371673002: Remove a bunch of provisionalDataSource() usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « components/html_viewer/layout_test_content_handler_impl.cc ('k') | components/test_runner/web_test_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/web_frame_test_proxy.h
diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
index e7e428f0c88d5b50c2c59f7cb5c225c1db437bf9..3c4a54c92c971f7796f92e18e42f860620b9dd3d 100644
--- a/components/test_runner/web_frame_test_proxy.h
+++ b/components/test_runner/web_frame_test_proxy.h
@@ -65,11 +65,10 @@ class WebFrameTestProxy : public Base {
Base::loadURLExternally(frame, request, policy, suggested_name);
}
- virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,
+ virtual void didStartProvisionalLoad(blink::WebDataSource* datasource,
double triggeringEventTime) {
- base_proxy_->DidStartProvisionalLoad(frame);
- Base::didStartProvisionalLoad(
- frame, triggeringEventTime);
+ base_proxy_->DidStartProvisionalLoad(Base::GetWebFrame());
+ Base::didStartProvisionalLoad(datasource, triggeringEventTime);
}
virtual void didReceiveServerRedirectForProvisionalLoad(
@@ -78,15 +77,12 @@ class WebFrameTestProxy : public Base {
Base::didReceiveServerRedirectForProvisionalLoad(frame);
}
- virtual void didFailProvisionalLoad(
- blink::WebLocalFrame* frame,
- const blink::WebURLError& error,
- blink::WebHistoryCommitType commit_type) {
- // If the test finished, don't notify the embedder of the failed load,
- // as we already destroyed the document loader.
- if (base_proxy_->DidFailProvisionalLoad(frame, error, commit_type))
- return;
- Base::didFailProvisionalLoad(frame, error, commit_type);
+ virtual void didFailProvisionalLoad(blink::WebDataSource* datasource,
+ const blink::WebURLError& error,
+ blink::WebHistoryCommitType commit_type) {
+ base_proxy_->DidFailProvisionalLoad(Base::GetWebFrame(), error,
+ commit_type);
+ Base::didFailProvisionalLoad(datasource, error, commit_type);
}
virtual void didCommitProvisionalLoad(
@@ -120,11 +116,11 @@ class WebFrameTestProxy : public Base {
Base::didHandleOnloadEvents(frame);
}
- virtual void didFailLoad(blink::WebLocalFrame* frame,
+ virtual void didFailLoad(blink::WebDataSource* datasource,
const blink::WebURLError& error,
blink::WebHistoryCommitType commit_type) {
- base_proxy_->DidFailLoad(frame, error, commit_type);
- Base::didFailLoad(frame, error, commit_type);
+ base_proxy_->DidFailLoad(Base::GetWebFrame(), error, commit_type);
+ Base::didFailLoad(datasource, error, commit_type);
}
virtual void didFinishLoad(blink::WebLocalFrame* frame) {
@@ -200,12 +196,12 @@ class WebFrameTestProxy : public Base {
Base::didCreateDataSource(frame, ds);
}
- virtual void willSendRequest(blink::WebLocalFrame* frame,
+ virtual void willSendRequest(blink::WebDataSource* datasource,
unsigned identifier,
blink::WebURLRequest& request,
const blink::WebURLResponse& redirect_response) {
- Base::willSendRequest(frame, identifier, request, redirect_response);
- base_proxy_->WillSendRequest(frame, identifier, request, redirect_response);
+ Base::willSendRequest(datasource, identifier, request, redirect_response);
+ base_proxy_->WillSendRequest(identifier, request, redirect_response);
}
virtual void didReceiveResponse(blink::WebLocalFrame* frame,
« no previous file with comments | « components/html_viewer/layout_test_content_handler_impl.cc ('k') | components/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698