| Index: content/browser/service_worker/service_worker_url_request_job.cc
|
| diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
|
| index a041426213c33d26ee4ef0b1e841fa9517cfe23a..0e6ef2b98fcc4d56a5b57c9d06f530c1d3a26c36 100644
|
| --- a/content/browser/service_worker/service_worker_url_request_job.cc
|
| +++ b/content/browser/service_worker/service_worker_url_request_job.cc
|
| @@ -18,6 +18,7 @@
|
| #include "content/common/service_worker/service_worker_types.h"
|
| #include "content/public/browser/blob_handle.h"
|
| #include "content/public/browser/resource_request_info.h"
|
| +#include "content/public/browser/service_worker_context.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/http/http_request_headers.h"
|
| #include "net/http/http_response_headers.h"
|
| @@ -30,17 +31,6 @@
|
|
|
| namespace content {
|
|
|
| -namespace {
|
| -
|
| -// Keep in sync with kDevToolsRequestInitiator and
|
| -// kDevToolsEmulateNetworkConditionsClientId defined in
|
| -// devtools_network_transaction.cc and InspectorResourceAgent.cpp.
|
| -const char kDevToolsRequestInitiator[] = "X-DevTools-Request-Initiator";
|
| -const char kDevToolsEmulateNetworkConditionsClientId[] =
|
| - "X-DevTools-Emulate-Network-Conditions-Client-Id";
|
| -
|
| -} // namespace
|
| -
|
| ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob(
|
| net::URLRequest* request,
|
| net::NetworkDelegate* network_delegate,
|
| @@ -299,10 +289,8 @@ ServiceWorkerURLRequestJob::CreateFetchRequest() {
|
| request->method = request_->method();
|
| const net::HttpRequestHeaders& headers = request_->extra_request_headers();
|
| for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();) {
|
| - if (it.name() == kDevToolsRequestInitiator ||
|
| - it.name() == kDevToolsEmulateNetworkConditionsClientId) {
|
| + if (ServiceWorkerContext::IsExcludedHeaderNameForFetchEvent(it.name()))
|
| continue;
|
| - }
|
| request->headers[it.name()] = it.value();
|
| }
|
| request->blob_uuid = blob_uuid;
|
|
|