| 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 50948a4ca041b5ccf54dcd93c429ab1700c8bd66..5920d4dae406a9b93778c4c53d06c114ef44b014 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(
|
| resource_type, 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));
|
|
|
| // Transfer ownership to the ServiceWorkerNavigationHandleCore.
|
| // In the case of a successful navigation, the SWProviderHost will be
|
| @@ -208,13 +208,13 @@ void ServiceWorkerRequestHandler::InitializeHandler(
|
| resource_type, 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>
|
|
|