ServiceWorker: Merge FindSWRegistration into FindOrCreateRegistration for cleanup

content/child/service_worker/service_worker_dispatcher.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/child/service_worker/service_worker_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 256 matching lines @@
 
   scoped_ptr<ServiceWorkerHandleReference> handle_ref =
       adopt_handle
           ? ServiceWorkerHandleReference::Adopt(info, sender_.get())
           : ServiceWorkerHandleReference::Create(info, sender_.get());
   // WebServiceWorkerImpl constructor calls AddServiceWorker.
   return new WebServiceWorkerImpl(handle_ref.Pass(), sender_.get());
 }
 
 WebServiceWorkerRegistrationImpl*
-ServiceWorkerDispatcher::FindServiceWorkerRegistration(
-    const ServiceWorkerRegistrationObjectInfo& info,
-    bool adopt_handle) {
-  RegistrationObjectMap::iterator registration =
-      registrations_.find(info.handle_id);
-  if (registration == registrations_.end())
-    return NULL;
-  if (adopt_handle) {
-    // We are instructed to adopt a handle but we already have one, so
-    // adopt and destroy a handle ref.
-    ServiceWorkerRegistrationHandleReference::Adopt(info, sender_.get());
-  }
-  return registration->second;
-}
-
-WebServiceWorkerRegistrationImpl*
 ServiceWorkerDispatcher::CreateServiceWorkerRegistration(
     const ServiceWorkerRegistrationObjectInfo& info,
     bool adopt_handle) {
-  DCHECK(!FindServiceWorkerRegistration(info, adopt_handle));
+  DCHECK(!ContainsKey(registrations_, info.handle_id));
   if (info.handle_id == kInvalidServiceWorkerRegistrationHandleId)
     return NULL;
 
   scoped_ptr<ServiceWorkerRegistrationHandleReference> handle_ref =
       adopt_handle ? ServiceWorkerRegistrationHandleReference::Adopt(
                          info, sender_.get())
                    : ServiceWorkerRegistrationHandleReference::Create(
                          info, sender_.get());
 
   // WebServiceWorkerRegistrationImpl constructor calls
@@ skipping 369 matching lines @@
 void ServiceWorkerDispatcher::RemoveServiceWorkerRegistration(
     int registration_handle_id) {
   DCHECK(ContainsKey(registrations_, registration_handle_id));
   registrations_.erase(registration_handle_id);
 }
 
 WebServiceWorkerRegistrationImpl*
 ServiceWorkerDispatcher::FindOrCreateRegistration(
     const ServiceWorkerRegistrationObjectInfo& info,
     const ServiceWorkerVersionAttributes& attrs) {
-  WebServiceWorkerRegistrationImpl* registration =
-      FindServiceWorkerRegistration(info, true);
-  if (!registration) {
-    registration = CreateServiceWorkerRegistration(info, true);
-    registration->SetInstalling(GetServiceWorker(attrs.installing, true));
-    registration->SetWaiting(GetServiceWorker(attrs.waiting, true));
-    registration->SetActive(GetServiceWorker(attrs.active, true));
-  } else {
-    // |registration| must already have version attributes, so adopt and destroy
-    // handle refs for them.
+  RegistrationObjectMap::iterator found = registrations_.find(info.handle_id);
+  if (found != registrations_.end()) {
+    ServiceWorkerRegistrationHandleReference::Adopt(info, sender_.get());
     ServiceWorkerHandleReference::Adopt(attrs.installing, sender_.get());
     ServiceWorkerHandleReference::Adopt(attrs.waiting, sender_.get());
     ServiceWorkerHandleReference::Adopt(attrs.active, sender_.get());
+    return found->second;
   }
+
+  bool adopt_handle = true;
+  WebServiceWorkerRegistrationImpl* registration =
+      CreateServiceWorkerRegistration(info, adopt_handle);
+  registration->SetInstalling(GetServiceWorker(attrs.installing, adopt_handle));
+  registration->SetWaiting(GetServiceWorker(attrs.waiting, adopt_handle));
+  registration->SetActive(GetServiceWorker(attrs.active, adopt_handle));
   return registration;
 }
 
 }  // namespace content