Index: content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc |
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc |
index 1eea2aafb99bef6555d0c2523da7beacf72a7aea..3e42b86ef3b869033d505956f87b8eb93cecc7dc 100644 |
--- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc |
+++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc |
@@ -7,15 +7,15 @@ |
#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; |
@@ -32,12 +32,12 @@ MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher( |
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 |
@@ -52,7 +52,6 @@ MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher( |
frame, |
request_context, |
WebURLRequest::FrameTypeNone, |
- ResourceFetcher::FRAME_ASSOCIATED_LOADER, |
base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete, |
base::Unretained(this))); |
} |