Snapshot of all changes to get jumbo in blink and content.

content/browser/service_worker/service_worker_request_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_request_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 #include "ipc/ipc_message.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "storage/browser/blob/blob_storage_context.h"
 
 namespace content {
 
 namespace {
 
-int kUserDataKey;  // Key value is not important.
+int kSWUserDataKey;  // Key value is not important.
 
 class ServiceWorkerRequestInterceptor
     : public net::URLRequestInterceptor {
  public:
   explicit ServiceWorkerRequestInterceptor(ResourceContext* resource_context)
       : resource_context_(resource_context) {}
   ~ServiceWorkerRequestInterceptor() override {}
   net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override {
@@ skipping 49 matching lines @@
           navigation_handle_core->context_wrapper()->context()->AsWeakPtr(),
           is_parent_frame_secure, web_contents_getter);
 
   std::unique_ptr<ServiceWorkerRequestHandler> handler(
       provider_host->CreateRequestHandler(
           FETCH_REQUEST_MODE_NAVIGATE, FETCH_CREDENTIALS_MODE_INCLUDE,
           FetchRedirectMode::MANUAL_MODE, std::string() /* integrity */,
           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
   // transferred to its "final" destination in the OnProviderCreated handler. If
   // the navigation fails, it will be destroyed along with the
   // ServiceWorkerNavigationHandleCore.
   navigation_handle_core->DidPreCreateProviderHost(std::move(provider_host));
 }
 
 // PlzNavigate and --enable-network-service.
@@ skipping 81 matching lines @@
       context_wrapper->context()->GetProviderHost(process_id, provider_id);
   if (!provider_host || !provider_host->IsContextAlive())
     return;
 
   std::unique_ptr<ServiceWorkerRequestHandler> handler(
       provider_host->CreateRequestHandler(
           request_mode, credentials_mode, redirect_mode, integrity,
           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>
 ServiceWorkerRequestHandler::CreateInterceptor(
     ResourceContext* resource_context) {
   return std::unique_ptr<net::URLRequestInterceptor>(
       new ServiceWorkerRequestInterceptor(resource_context));
 }
 
 bool ServiceWorkerRequestHandler::IsControlledByServiceWorker(
@@ skipping 69 matching lines @@
     ResourceType resource_type)
     : context_(context),
       provider_host_(provider_host),
       blob_storage_context_(blob_storage_context),
       resource_type_(resource_type),
       old_process_id_(0),
       old_provider_id_(kInvalidServiceWorkerProviderId) {
 }
 
 }  // namespace content