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

10 files changed, 52 insertions, 28 deletions

diff --git a/content/public/renderer/resource_fetcher.h b/content/public/renderer/resource_fetcher.h
index 05967f1..4cb5689 100644
--- a/content/public/renderer/resource_fetcher.h
+++ b/content/public/renderer/resource_fetcher.h
@@ -51,7 +51,8 @@ class CONTENT_EXPORT ResourceFetcher {
   // Starts the request using the specified frame.  Calls |callback| when
   // done.
   virtual void Start(blink::WebFrame* frame,
-                     blink::WebURLRequest::TargetType target_type,
+                     blink::WebURLRequest::RequestContext request_context,
+                     blink::WebURLRequest::FrameType frame_type,
                      const Callback& callback) = 0;
 
   // Sets how long to wait for the server to reply.  By default, there is no
diff --git a/content/renderer/fetchers/image_resource_fetcher.cc b/content/renderer/fetchers/image_resource_fetcher.cc
index 9fee6f4..e7d7c8d 100644
--- a/content/renderer/fetchers/image_resource_fetcher.cc
+++ b/content/renderer/fetchers/image_resource_fetcher.cc
@@ -25,16 +25,18 @@ ImageResourceFetcher::ImageResourceFetcher(
     WebFrame* frame,
     int id,
     int image_size,
-    WebURLRequest::TargetType target_type,
+    WebURLRequest::RequestContext request_context,
     const Callback& callback)
     : callback_(callback),
       id_(id),
       image_url_(image_url),
       image_size_(image_size) {
   fetcher_.reset(ResourceFetcher::Create(image_url));
-  fetcher_->Start(frame, target_type,
+  fetcher_->Start(frame,
+                  request_context,
+                  WebURLRequest::FrameTypeNone,
                   base::Bind(&ImageResourceFetcher::OnURLFetchComplete,
-                      base::Unretained(this)));
+                             base::Unretained(this)));
 
   // Set subresource URL for crash reporting.
   base::debug::SetCrashKeyValue("subresource_url", image_url.spec());
diff --git a/content/renderer/fetchers/image_resource_fetcher.h b/content/renderer/fetchers/image_resource_fetcher.h
index 2edcf32..eca62af 100644
--- a/content/renderer/fetchers/image_resource_fetcher.h
+++ b/content/renderer/fetchers/image_resource_fetcher.h
@@ -29,13 +29,12 @@ class ImageResourceFetcher {
  public:
   typedef base::Callback<void(ImageResourceFetcher*, const SkBitmap&)> Callback;
 
-  ImageResourceFetcher(
-      const GURL& image_url,
-      blink::WebFrame* frame,
-      int id,
-      int image_size,
-      blink::WebURLRequest::TargetType target_type,
-      const Callback& callback);
+  ImageResourceFetcher(const GURL& image_url,
+                       blink::WebFrame* frame,
+                       int id,
+                       int image_size,
+                       blink::WebURLRequest::RequestContext request_context,
+                       const Callback& callback);
 
   virtual ~ImageResourceFetcher();
 
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
index 2f4b3ff..4a2ad63 100644
--- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
+++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
@@ -23,7 +23,7 @@ MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher(
     const GURL& image_url,
     WebFrame* frame,
     int id,
-    WebURLRequest::TargetType target_type,
+    WebURLRequest::RequestContext request_context,
     const Callback& callback)
     : callback_(callback),
       id_(id),
@@ -31,7 +31,9 @@ MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher(
       image_url_(image_url) {
   fetcher_.reset(ResourceFetcher::Create(image_url));
   fetcher_->Start(
-      frame, target_type,
+      frame,
+      request_context,
+      WebURLRequest::FrameTypeNone,
       base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete,
                  base::Unretained(this)));
 }
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
index 1b32950..c968a87 100644
--- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
+++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
@@ -36,7 +36,7 @@ class MultiResolutionImageResourceFetcher {
       const GURL& image_url,
       blink::WebFrame* frame,
       int id,
-      blink::WebURLRequest::TargetType target_type,
+      blink::WebURLRequest::RequestContext request_context,
       const Callback& callback);
 
   virtual ~MultiResolutionImageResourceFetcher();
diff --git a/content/renderer/fetchers/resource_fetcher_impl.cc b/content/renderer/fetchers/resource_fetcher_impl.cc
index 6462e76..7b25d12 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.cc
+++ b/content/renderer/fetchers/resource_fetcher_impl.cc
@@ -79,7 +79,8 @@ void ResourceFetcherImpl::SetHeader(const std::string& header,
 }
 
 void ResourceFetcherImpl::Start(WebFrame* frame,
-                                WebURLRequest::TargetType target_type,
+                                WebURLRequest::RequestContext request_context,
+                                WebURLRequest::FrameType frame_type,
                                 const Callback& callback) {
   DCHECK(!loader_);
   DCHECK(!request_.isNull());
@@ -90,7 +91,8 @@ void ResourceFetcherImpl::Start(WebFrame* frame,
 
   callback_ = callback;
 
-  request_.setTargetType(target_type);
+  request_.setRequestContext(request_context);
+  request_.setFrameType(frame_type);
   request_.setFirstPartyForCookies(frame->document().firstPartyForCookies());
   frame->dispatchWillSendRequest(request_);
   loader_.reset(blink::Platform::current()->createURLLoader());
diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h
index aed1d79..74c9919 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.h
+++ b/content/renderer/fetchers/resource_fetcher_impl.h
@@ -36,7 +36,8 @@ class ResourceFetcherImpl : public ResourceFetcher,
   virtual void SetHeader(const std::string& header,
                          const std::string& value) OVERRIDE;
   virtual void Start(blink::WebFrame* frame,
-                     blink::WebURLRequest::TargetType target_type,
+                     blink::WebURLRequest::RequestContext request_context,
+                     blink::WebURLRequest::FrameType frame_type,
                      const Callback& callback) OVERRIDE;
   virtual void SetTimeout(const base::TimeDelta& timeout) OVERRIDE;
 
diff --git a/content/renderer/image_loading_helper.cc b/content/renderer/image_loading_helper.cc
index 1eb98dc..27e0ea1 100644
--- a/content/renderer/image_loading_helper.cc
+++ b/content/renderer/image_loading_helper.cc
@@ -141,8 +141,8 @@ bool ImageLoadingHelper::DownloadImage(int id,
       image_url,
       render_frame()->GetWebFrame(),
       id,
-      is_favicon ? WebURLRequest::TargetIsFavicon :
-                   WebURLRequest::TargetIsImage,
+      is_favicon ? WebURLRequest::RequestContextFavicon
+                 : WebURLRequest::RequestContextImage,
       base::Bind(&ImageLoadingHelper::DidDownloadImage,
                  base::Unretained(this),
                  max_image_size)));
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc
index 2919f58..70b3d31 100644
--- a/content/renderer/resource_fetcher_browsertest.cc
+++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -150,7 +150,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
@@ -166,7 +168,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
@@ -183,7 +187,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
     GURL url("http://localhost:1339/doesnotexist");
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
@@ -201,7 +207,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
     fetcher->SetTimeout(base::TimeDelta());
 
@@ -220,7 +228,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
 
     scoped_ptr<EvilFetcherDelegate> delegate(new EvilFetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
     fetcher->SetTimeout(base::TimeDelta());
     delegate->SetFetcher(fetcher.release());
@@ -238,7 +248,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
     fetcher->SetMethod("POST");
     fetcher->SetBody(kBody);
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
@@ -255,7 +267,9 @@ class ResourceFetcherTests : public ContentBrowserTest {
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
     fetcher->SetHeader("header", kHeader);
-    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+    fetcher->Start(frame,
+                   WebURLRequest::RequestContextInternal,
+                   WebURLRequest::FrameTypeNone,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
diff --git a/content/renderer/web_ui_mojo_context_state.cc b/content/renderer/web_ui_mojo_context_state.cc
index f1ff5f4..ad11626 100644
--- a/content/renderer/web_ui_mojo_context_state.cc
+++ b/content/renderer/web_ui_mojo_context_state.cc
@@ -102,9 +102,12 @@ void WebUIMojoContextState::FetchModule(const std::string& id) {
   fetched_modules_.insert(id);
   ResourceFetcher* fetcher = ResourceFetcher::Create(url);
   module_fetchers_.push_back(fetcher);
-  fetcher->Start(frame_, blink::WebURLRequest::TargetIsScript,
+  fetcher->Start(frame_,
+                 blink::WebURLRequest::RequestContextScript,
+                 blink::WebURLRequest::FrameTypeNone,
                  base::Bind(&WebUIMojoContextState::OnFetchModuleComplete,
-                            base::Unretained(this), fetcher));
+                            base::Unretained(this),
+                            fetcher));
 }
 
 void WebUIMojoContextState::OnFetchModuleComplete(