| Index: content/browser/service_worker/service_worker_request_handler.cc
|
| diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
|
| index df8b6fcc7d6cb10366246eaaf780eb2f9c414426..fd3b3af929d7c75368fba072b549a40b7abad892 100644
|
| --- a/content/browser/service_worker/service_worker_request_handler.cc
|
| +++ b/content/browser/service_worker/service_worker_request_handler.cc
|
| @@ -36,7 +36,7 @@ namespace content {
|
|
|
| namespace {
|
|
|
| -int kUserDataKey; // Key value is not important.
|
| +int kSWUserDataKey; // Key value is not important.
|
|
|
| class ServiceWorkerRequestInterceptor
|
| : public net::URLRequestInterceptor {
|
| @@ -106,7 +106,7 @@ void ServiceWorkerRequestHandler::InitializeForNavigation(
|
| frame_type, blob_storage_context->AsWeakPtr(), body,
|
| skip_service_worker));
|
| if (handler)
|
| - request->SetUserData(&kUserDataKey, std::move(handler));
|
| + request->SetUserData(&kSWUserDataKey, std::move(handler));
|
|
|
| // Transfer ownership to the ServiceWorkerNavigationHandleCore.
|
| // In the case of a successful navigation, the SWProviderHost will be
|
| @@ -207,13 +207,13 @@ void ServiceWorkerRequestHandler::InitializeHandler(
|
| request_context_type, frame_type, blob_storage_context->AsWeakPtr(),
|
| body, skip_service_worker));
|
| if (handler)
|
| - request->SetUserData(&kUserDataKey, std::move(handler));
|
| + request->SetUserData(&kSWUserDataKey, std::move(handler));
|
| }
|
|
|
| ServiceWorkerRequestHandler* ServiceWorkerRequestHandler::GetHandler(
|
| const net::URLRequest* request) {
|
| return static_cast<ServiceWorkerRequestHandler*>(
|
| - request->GetUserData(&kUserDataKey));
|
| + request->GetUserData(&kSWUserDataKey));
|
| }
|
|
|
| std::unique_ptr<net::URLRequestInterceptor>
|
|
|