| Index: content/browser/service_worker/service_worker_fetch_dispatcher.cc
|
| diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
|
| index cc920c253ba13d9ef33ebf4887148f435f523ceb..9ada39ab56e98b6d8a83848fe69677da79e10d8c 100644
|
| --- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc
|
| +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
|
| @@ -6,30 +6,17 @@
|
|
|
| #include "base/bind.h"
|
| #include "content/browser/service_worker/service_worker_version.h"
|
| -#include "content/public/browser/resource_request_info.h"
|
| -#include "content/public/common/page_transition_types.h"
|
| -#include "net/url_request/url_request.h"
|
|
|
| namespace content {
|
|
|
| ServiceWorkerFetchDispatcher::ServiceWorkerFetchDispatcher(
|
| - net::URLRequest* request,
|
| + scoped_ptr<ServiceWorkerFetchRequest> request,
|
| ServiceWorkerVersion* version,
|
| const FetchCallback& callback)
|
| : version_(version),
|
| callback_(callback),
|
| + request_(request.Pass()),
|
| weak_factory_(this) {
|
| - request_.url = request->url();
|
| - request_.method = request->method();
|
| - const net::HttpRequestHeaders& headers = request->extra_request_headers();
|
| - for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();)
|
| - request_.headers[it.name()] = it.value();
|
| - request_.referrer = GURL(request->referrer());
|
| - const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
| - if (info) {
|
| - request_.is_reload = PageTransitionCoreTypeIs(info->GetPageTransition(),
|
| - PAGE_TRANSITION_RELOAD);
|
| - }
|
| }
|
|
|
| ServiceWorkerFetchDispatcher::~ServiceWorkerFetchDispatcher() {}
|
| @@ -69,7 +56,7 @@ void ServiceWorkerFetchDispatcher::DidFailActivation() {
|
|
|
| void ServiceWorkerFetchDispatcher::DispatchFetchEvent() {
|
| version_->DispatchFetchEvent(
|
| - request_,
|
| + *request_.get(),
|
| base::Bind(&ServiceWorkerFetchDispatcher::DidFinish,
|
| weak_factory_.GetWeakPtr()));
|
| }
|
|
|