ServiceWorker: Refactor CrossSiteTransfer on ServiceWorkerProviderHost

content/browser/service_worker/service_worker_context_core.cc

 // Copyright 2013 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_context_core.h"
 
 #include <limits>
 #include <set>
 #include <utility>
 
@@ skipping 663 matching lines @@
     const StatusCallback& callback) {
   job_coordinator_->AbortAll();
   storage_->DeleteAndStartOver(callback);
 }
 
 std::unique_ptr<ServiceWorkerProviderHost>
 ServiceWorkerContextCore::TransferProviderHostOut(int process_id,
                                                   int provider_id) {
   ProviderMap* map = GetProviderMapForProcess(process_id);
   ServiceWorkerProviderHost* transferee = map->Lookup(provider_id);
-  std::unique_ptr<ServiceWorkerProviderHost> replacement =
+  std::unique_ptr<ServiceWorkerProviderHost> provisional_host =
       transferee->PrepareForCrossSiteTransfer();
-  return map->Replace(provider_id, std::move(replacement));
+  return map->Replace(provider_id, std::move(provisional_host));
 }
 
 void ServiceWorkerContextCore::TransferProviderHostIn(
     int new_process_id,
     int new_provider_id,
     std::unique_ptr<ServiceWorkerProviderHost> transferee) {
   ProviderMap* map = GetProviderMapForProcess(new_process_id);
-  ServiceWorkerProviderHost* temp = map->Lookup(new_provider_id);
-  if (!temp)
+  ServiceWorkerProviderHost* provisional_host = map->Lookup(new_provider_id);
+  if (!provisional_host)
     return;
 
-  DCHECK(temp->document_url().is_empty());
-  transferee->CompleteCrossSiteTransfer(new_process_id,
-                                        temp->frame_id(),
-                                        new_provider_id,
-                                        temp->provider_type(),
-                                        temp->dispatcher_host());
+  DCHECK(provisional_host->document_url().is_empty());
+  transferee->CompleteCrossSiteTransfer(provisional_host);
   map->Replace(new_provider_id, std::move(transferee));
 }
 
 void ServiceWorkerContextCore::ClearAllServiceWorkersForTest(
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // |callback| will be called in the destructor of |helper| on the UI thread.
   scoped_refptr<ClearAllServiceWorkersHelper> helper(
       new ClearAllServiceWorkersHelper(callback));
   if (!was_service_worker_registered_)
@@ skipping 204 matching lines @@
     int service_worker_provider_id,
     mojom::ServiceWorkerWorkerClientAssociatedPtrInfo client_ptr_info) {
   ServiceWorkerProviderHost* provider_host =
       GetProviderHost(render_process_id, service_worker_provider_id);
   if (!provider_host)
     return;
   provider_host->BindWorkerFetchContext(std::move(client_ptr_info));
 }
 
 }  // namespace content