AssociatedURLLoader shouldn't derive from WebURLLoader

content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/child/image_decoder.h"
-#include "content/public/renderer/resource_fetcher.h"
+#include "content/public/renderer/associated_resource_fetcher.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderOptions.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebURLLoaderOptions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 
 using blink::WebFrame;
-using blink::WebURLLoaderOptions;
+using blink::WebAssociatedURLLoaderOptions;
 using blink::WebURLRequest;
 using blink::WebURLResponse;
 
 namespace content {
 
 MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher(
     const GURL& image_url,
     WebFrame* frame,
     int id,
     WebURLRequest::RequestContext request_context,
     blink::WebCachePolicy cache_policy,
     const Callback& callback)
     : callback_(callback),
       id_(id),
       http_status_code_(0),
       image_url_(image_url) {
-  fetcher_.reset(ResourceFetcher::Create(image_url));
+  fetcher_.reset(AssociatedResourceFetcher::Create(image_url));
 
-  WebURLLoaderOptions options;
+  WebAssociatedURLLoaderOptions options;
   options.allowCredentials = true;
   options.crossOriginRequestPolicy =
-      WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
+      WebAssociatedURLLoaderOptions::CrossOriginRequestPolicyAllow;
   fetcher_->SetLoaderOptions(options);
 
   // To prevent cache tainting, the favicon requests have to by-pass the service
   // workers. This should ideally not happen or at least not all the time.
   // See https://crbug.com/448427
   if (request_context == WebURLRequest::RequestContextFavicon)
     fetcher_->SetSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
 
   fetcher_->SetCachePolicy(cache_policy);
 
   fetcher_->Start(
       frame,
       request_context,
       WebURLRequest::FrameTypeNone,
-      ResourceFetcher::FRAME_ASSOCIATED_LOADER,
       base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete,
                  base::Unretained(this)));
 }
 
 MultiResolutionImageResourceFetcher::~MultiResolutionImageResourceFetcher() {
 }
 
 void MultiResolutionImageResourceFetcher::OnURLFetchComplete(
     const WebURLResponse& response,
     const std::string& data) {
@@ skipping 10 matching lines @@
     // If we get here, it means no image from server or couldn't decode the
     // response as an image. The delegate will see an empty vector.
 
   // Take a reference to the callback as running the callback may lead to our
   // destruction.
   Callback callback = callback_;
   callback.Run(this, bitmaps);
 }
 
 }  // namespace content