| Index: content/renderer/fetchers/manifest_fetcher.cc
|
| diff --git a/content/renderer/fetchers/manifest_fetcher.cc b/content/renderer/fetchers/manifest_fetcher.cc
|
| index 8a39d26bb921adeb3288ae0f998444d5f9f4e809..bf18347ca281d56ef35f1188087a2bc3697dec1c 100644
|
| --- a/content/renderer/fetchers/manifest_fetcher.cc
|
| +++ b/content/renderer/fetchers/manifest_fetcher.cc
|
| @@ -6,15 +6,16 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| -#include "content/public/renderer/resource_fetcher.h"
|
| +#include "content/public/renderer/associated_resource_fetcher.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| +#include "third_party/WebKit/public/web/WebAssociatedURLLoaderOptions.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
|
|
| namespace content {
|
|
|
| ManifestFetcher::ManifestFetcher(const GURL& url)
|
| : completed_(false) {
|
| - fetcher_.reset(ResourceFetcher::Create(url));
|
| + fetcher_.reset(AssociatedResourceFetcher::Create(url));
|
| }
|
|
|
| ManifestFetcher::~ManifestFetcher() {
|
| @@ -27,16 +28,15 @@ void ManifestFetcher::Start(blink::WebFrame* frame,
|
| const Callback& callback) {
|
| callback_ = callback;
|
|
|
| - blink::WebURLLoaderOptions options;
|
| + blink::WebAssociatedURLLoaderOptions options;
|
| options.allowCredentials = use_credentials;
|
| - options.crossOriginRequestPolicy =
|
| - blink::WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
|
| + options.crossOriginRequestPolicy = blink::WebAssociatedURLLoaderOptions::
|
| + CrossOriginRequestPolicyUseAccessControl;
|
| fetcher_->SetLoaderOptions(options);
|
|
|
| fetcher_->Start(frame,
|
| blink::WebURLRequest::RequestContextManifest,
|
| blink::WebURLRequest::FrameTypeNone,
|
| - ResourceFetcher::FRAME_ASSOCIATED_LOADER,
|
| base::Bind(&ManifestFetcher::OnLoadComplete,
|
| base::Unretained(this)));
|
| }
|
|
|