AssociatedURLLoader shouldn't derive from WebURLLoader

content/public/renderer/associated_resource_fetcher.h

Index: content/public/renderer/associated_resource_fetcher.h
diff --git a/content/public/renderer/resource_fetcher.h b/content/public/renderer/associated_resource_fetcher.h
similarity index 50%
copy from content/public/renderer/resource_fetcher.h
copy to content/public/renderer/associated_resource_fetcher.h
index 71a12c4c7adfeb47bf50dbbbb70c8f1ae80853f3..adf394182680f65db62aa34b4c9b30e5a4ea665b 100644
--- a/content/public/renderer/resource_fetcher.h
+++ b/content/public/renderer/associated_resource_fetcher.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_RENDERER_RESOURCE_FETCHER_H_
-#define CONTENT_PUBLIC_RENDERER_RESOURCE_FETCHER_H_
+#ifndef CONTENT_PUBLIC_RENDERER_ASSOCIATED_RESOURCE_FETCHER_H_
+#define CONTENT_PUBLIC_RENDERER_ASSOCIATED_RESOURCE_FETCHER_H_
 
 #include <string>
 
@@ -13,72 +13,55 @@
 
 class GURL;
 
-namespace base {
-class TimeDelta;
-}
-
 namespace blink {
 class WebFrame;
 class WebURLResponse;
 enum class WebCachePolicy;
-struct WebURLLoaderOptions;
+struct WebAssociatedURLLoaderOptions;
 }
 
 namespace content {
 
 // Interface to download resources asynchronously.
-class CONTENT_EXPORT ResourceFetcher {
+class CONTENT_EXPORT AssociatedResourceFetcher {
  public:
-  enum LoaderType {
-    PLATFORM_LOADER,         // uses Platform::createURLLoader
-    FRAME_ASSOCIATED_LOADER, // uses WebFrame::createAssociatedURLLoader
-  };
-
-  virtual ~ResourceFetcher() {}
+  virtual ~AssociatedResourceFetcher() {}
 
   // This will be called asynchronously after the URL has been fetched,
   // successfully or not.  If there is a failure, response and data will both be
   // empty.  |response| and |data| are both valid until the URLFetcher instance
   // is destroyed.
   typedef base::Callback<void(const blink::WebURLResponse& response,
-                              const std::string& data)> Callback;
+                              const std::string& data)>
+      Callback;
 
-  // Creates a ResourceFetcher for the specified resource.  Caller takes
-  // ownership of the returned object.  Deleting the ResourceFetcher will cancel
+  // Creates a AssociatedResourceFetcher for the specified resource.  Caller
+  // takes
+  // ownership of the returned object.  Deleting the AssociatedResourceFetcher
+  // will cancel
   // the request, and the callback will never be run.
-  static ResourceFetcher* Create(const GURL& url);
+  static AssociatedResourceFetcher* Create(const GURL& url);
 
-  // Set the corresponding parameters of the request.  Must be called before
-  // Start.  By default, requests are GETs with no body and respect the default
-  // cache policy.
-  virtual void SetMethod(const std::string& method) = 0;
-  virtual void SetBody(const std::string& body) = 0;
-  virtual void SetHeader(const std::string& header,
-                         const std::string& value) = 0;
   virtual void SetSkipServiceWorker(
       blink::WebURLRequest::SkipServiceWorker skip_service_worker) = 0;
   virtual void SetCachePolicy(blink::WebCachePolicy policy) = 0;
 
   // Associate the corresponding WebURLLoaderOptions to the loader. Must be
   // called before Start. Used if the LoaderType is FRAME_ASSOCIATED_LOADER.
-  virtual void SetLoaderOptions(const blink::WebURLLoaderOptions& options) = 0;
+  virtual void SetLoaderOptions(
+      const blink::WebAssociatedURLLoaderOptions& options) = 0;
 
   // Starts the request using the specified frame.  Calls |callback| when
   // done.
   virtual void Start(blink::WebFrame* frame,
                      blink::WebURLRequest::RequestContext request_context,
                      blink::WebURLRequest::FrameType frame_type,
-                     LoaderType loader_type,
                      const Callback& callback) = 0;
 
-  // Sets how long to wait for the server to reply.  By default, there is no
-  // timeout.  Must be called after a request is started.
-  virtual void SetTimeout(const base::TimeDelta& timeout) = 0;
-
   // Manually cancel the request.
   virtual void Cancel() = 0;
 };
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_RESOURCE_FETCHER_H_
+#endif  // CONTENT_PUBLIC_RENDERER_ASSOCIATED_RESOURCE_FETCHER_H_