AssociatedURLLoader shouldn't derive from WebURLLoader

content/renderer/fetchers/resource_fetcher_impl.h

Index: content/renderer/fetchers/resource_fetcher_impl.h
diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h
index 1dfa0510c564c9d7c845442f4ae7e4f7301e45c3..70c0d2a236eb9736d93f0f364494955d4644fdb3 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.h
+++ b/content/renderer/fetchers/resource_fetcher_impl.h
@@ -13,65 +13,47 @@
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "content/public/renderer/resource_fetcher.h"
-#include "content/renderer/fetchers/web_url_loader_client_impl.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "third_party/WebKit/public/web/WebURLLoaderOptions.h"
 
 class GURL;
 
 namespace blink {
 class WebFrame;
 class WebURLLoader;
-enum class WebCachePolicy;
 }
 
 namespace content {
 
-class ResourceFetcherImpl : public ResourceFetcher,
-                            public WebURLLoaderClientImpl {
+class ResourceFetcherImpl : public ResourceFetcher {
  public:
   // ResourceFetcher implementation:
   void SetMethod(const std::string& method) override;
   void SetBody(const std::string& body) override;
   void SetHeader(const std::string& header, const std::string& value) override;
-  void SetSkipServiceWorker(
-      blink::WebURLRequest::SkipServiceWorker skip_service_worker) override;
-  void SetCachePolicy(blink::WebCachePolicy policy) override;
-  void SetLoaderOptions(const blink::WebURLLoaderOptions& options) override;
   void Start(blink::WebFrame* frame,
              blink::WebURLRequest::RequestContext request_context,
              blink::WebURLRequest::FrameType frame_type,
-             LoaderType loader_type,
              const Callback& callback) override;
   void SetTimeout(const base::TimeDelta& timeout) override;
 
  private:
   friend class ResourceFetcher;
 
+  class ClientImpl;
+
   explicit ResourceFetcherImpl(const GURL& url);
 
   ~ResourceFetcherImpl() override;
 
-  // Callback for timer that limits how long we wait for the server.  If this
-  // timer fires and the request hasn't completed, we kill the request.
-  void TimeoutFired();
-
-  // WebURLLoaderClientImpl methods:
-  void OnLoadComplete() override;
+  void OnLoadComplete();
   void Cancel() override;
 
   std::unique_ptr<blink::WebURLLoader> loader_;
-
-  // Options to send to the loader.
-  blink::WebURLLoaderOptions options_;
+  std::unique_ptr<ClientImpl> client_;
 
   // Request to send.
   blink::WebURLRequest request_;
 
-  // Callback when we're done.
-  Callback callback_;
-
   // Limit how long to wait for the server.
   base::OneShotTimer timeout_timer_;