From 4a971fa56b5ea21e31fd71f4b5c7262cc01b9708 Mon Sep 17 00:00:00 2001 From: "kbr@chromium.org" Date: Tue, 29 Jul 2014 23:42:40 +0000 Subject: Revert 286241 "Revert 286126 "Remove 'WebURLRequest::TargetType'..." This and related CLs were not the cause of apparent flakiness. Apologies. Re-landing. > Revert 286126 "Remove 'WebURLRequest::TargetType' from 'content:..." > > Believe this and related changes are the cause of recently introduced > flakiness on the GPU bots. See Issue 390497. > > > Remove 'WebURLRequest::TargetType' from 'content::ResourceFetcher::Start' > > > > 'WebURLRequest::TargetType' has been dropped in Blink in favor of > > 'RequestContext' and 'FrameType', matching the Fetch specification's > > changes, and allowing both more granularity in various Blink-side checks > > and more clarity around the thing that caused a request, and the frame > > that the request affects. > > > > This CL should have zero practical effect, as it's simply hoisting the > > translation work that 'WebURLRequest::setTargetType' is already doing > > up into the content layer to bring us one step closer to removing the > > concept entirely. > > > > BUG=390497 > > > > Review URL: https://codereview.chromium.org/403313005 > > TBR=mkwst@chromium.org > > Review URL: https://codereview.chromium.org/423163003 TBR=kbr@chromium.org Review URL: https://codereview.chromium.org/423303003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286338 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/net/net_error_helper.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'chrome/renderer/net/net_error_helper.cc') diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index 315c787..8ccc64e 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -259,10 +259,13 @@ void NetErrorHelper::FetchNavigationCorrections( correction_fetcher_->SetMethod("POST"); correction_fetcher_->SetBody(navigation_correction_request_body); correction_fetcher_->SetHeader("Content-Type", "application/json"); + correction_fetcher_->Start( - frame, blink::WebURLRequest::TargetIsMainFrame, + frame, + blink::WebURLRequest::RequestContextInternal, + blink::WebURLRequest::FrameTypeTopLevel, base::Bind(&NetErrorHelper::OnNavigationCorrectionsFetched, - base::Unretained(this))); + base::Unretained(this))); correction_fetcher_->SetTimeout( base::TimeDelta::FromSeconds(kNavigationCorrectionFetchTimeoutSec)); @@ -285,8 +288,11 @@ void NetErrorHelper::SendTrackingRequest( tracking_fetcher_->SetMethod("POST"); tracking_fetcher_->SetBody(tracking_request_body); tracking_fetcher_->SetHeader("Content-Type", "application/json"); + tracking_fetcher_->Start( - frame, blink::WebURLRequest::TargetIsMainFrame, + frame, + blink::WebURLRequest::RequestContextInternal, + blink::WebURLRequest::FrameTypeTopLevel, base::Bind(&NetErrorHelper::OnTrackingRequestComplete, base::Unretained(this))); } -- cgit v1.1