ServiceWorker: Ensure that ServiceWorkerDispatcher always adopts passed handle references (2)

content/child/service_worker/service_worker_dispatcher.h

 // 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.
 
 #ifndef CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 95 matching lines @@
   // (This is attached only to the document thread's ServiceWorkerDispatcher)
   void AddProviderContext(ServiceWorkerProviderContext* provider_context);
   void RemoveProviderContext(ServiceWorkerProviderContext* provider_context);
 
   // Called when navigator.serviceWorker is instantiated or detached
   // for a document whose provider can be identified by |provider_id|.
   void AddProviderClient(int provider_id,
                          blink::WebServiceWorkerProviderClient* client);
   void RemoveProviderClient(int provider_id);
 
-  // Returns the existing service worker or a newly created one. When a new one
-  // is created, increments an interprocess reference to the service worker via
-  // ServiceWorkerHandleReference. Returns nullptr if the given info is invalid.
+  // Returns the existing service worker or a newly created one with the given
+  // handle reference. Returns nullptr if the given reference is invalid.
   scoped_refptr<WebServiceWorkerImpl> GetOrCreateServiceWorker(
-      const ServiceWorkerObjectInfo& info);
-
-  // Returns the existing service worker or a newly created one. Always adopts
-  // an interprocess reference to the service worker via
-  // ServiceWorkerHandleReference. Returns nullptr if the given info is invalid.
-  scoped_refptr<WebServiceWorkerImpl> GetOrAdoptServiceWorker(
-      const ServiceWorkerObjectInfo& info);
+      scoped_ptr<ServiceWorkerHandleReference> handle_ref);
 
   // Returns the existing registration or a newly created one. When a new one is
   // created, increments interprocess references to the registration and its
   // versions via ServiceWorker(Registration)HandleReference.
   scoped_refptr<WebServiceWorkerRegistrationImpl> GetOrCreateRegistration(
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
 
   // Returns the existing registration or a newly created one. Always adopts
   // interprocess references to the registration and its versions via
@@ skipping 141 matching lines @@
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_