ServiceWorker: Merge FindSWRegistration into FindOrCreateRegistration for cleanup

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 94 matching lines @@
   // method can return an existing WebServiceWorkerImpl, in which case
   // it is owned by a WebCore::ServiceWorker and the lifetime is not
   // being transferred to the owner; or it can create a
   // WebServiceWorkerImpl, in which case ownership is transferred to
   // the caller who must bounce it to a method that will associate it
   // with a WebCore::ServiceWorker.
   WebServiceWorkerImpl* GetServiceWorker(
       const ServiceWorkerObjectInfo& info,
       bool adopt_handle);
 
-  // Finds a WebServiceWorkerRegistrationImpl for the specified registration.
-  // If it's not found, returns NULL. If |adopt_handle| is true,
-  // a ServiceWorkerRegistrationHandleReference will be adopted for the
-  // registration.
-  WebServiceWorkerRegistrationImpl* FindServiceWorkerRegistration(
-      const ServiceWorkerRegistrationObjectInfo& info,
-      bool adopt_handle);
-
   // Creates a WebServiceWorkerRegistrationImpl for the specified registration
   // and transfers its ownership to the caller. If |adopt_handle| is true, a
   // ServiceWorkerRegistrationHandleReference will be adopted for the
   // registration.
   WebServiceWorkerRegistrationImpl* CreateServiceWorkerRegistration(
       const ServiceWorkerRegistrationObjectInfo& info,
       bool adopt_handle);
 
   // |sender| needs to be passed in because if the call leads to construction
   // it will be needed.
@@ skipping 94 matching lines @@
   void AddServiceWorker(int handle_id, WebServiceWorkerImpl* worker);
   void RemoveServiceWorker(int handle_id);
 
   // Keeps map from registration_handle_id to ServiceWorkerRegistration object.
   void AddServiceWorkerRegistration(
       int registration_handle_id,
       WebServiceWorkerRegistrationImpl* registration);
   void RemoveServiceWorkerRegistration(
       int registration_handle_id);
 
+  // Returns an existing registration or new one filled in with version
+  // attributes. This function assumes given |info| and |attrs| retain handle
+  // references and always adopts them.
+  // TODO(nhiroki): This assumption seems to impair readability. We could
+  // explictly pass ServiceWorker(Registration)HandleReference instead.
   WebServiceWorkerRegistrationImpl* FindOrCreateRegistration(
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
 
   RegistrationCallbackMap pending_registration_callbacks_;
   UnregistrationCallbackMap pending_unregistration_callbacks_;
   GetRegistrationCallbackMap pending_get_registration_callbacks_;
   GetRegistrationForReadyCallbackMap get_for_ready_callbacks_;
 
   ProviderClientMap provider_clients_;
   ProviderContextMap provider_contexts_;
 
   WorkerObjectMap service_workers_;
   RegistrationObjectMap registrations_;
 
   // A map for ServiceWorkers that are associated to a particular document
   // (e.g. as .current).
   WorkerToProviderMap worker_to_provider_;
 
   scoped_refptr<ServiceWorkerMessageSender> sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_