ServiceWorker: Make APIs that return ServiceWorkerRegistration coin a new JS object (2/3)

content/browser/service_worker/service_worker_dispatcher_host.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_dispatcher_host.h"
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 241 matching lines @@
     DCHECK(handle->version());
     if (handle->provider_id() == provider_id &&
         handle->version()->version_id() == version_id) {
       return handle;
     }
   }
   return NULL;
 }
 
 ServiceWorkerRegistrationHandle*
-ServiceWorkerDispatcherHost::GetOrCreateRegistrationHandle(
+ServiceWorkerDispatcherHost::CreateRegistrationHandle(
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     ServiceWorkerRegistration* registration) {
   DCHECK(provider_host);
-  ServiceWorkerRegistrationHandle* handle =
-      FindRegistrationHandle(provider_host->provider_id(), registration->id());
-  if (handle) {
-    handle->IncrementRefCount();
-    return handle;
-  }
-
-  scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
-      new ServiceWorkerRegistrationHandle(
-          GetContext()->AsWeakPtr(), provider_host, registration));
-  handle = new_handle.get();
-  RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
-  return handle;
+  scoped_ptr<ServiceWorkerRegistrationHandle> handle(
+      new ServiceWorkerRegistrationHandle(GetContext()->AsWeakPtr(),
+                                          provider_host, registration));
+  ServiceWorkerRegistrationHandle* handle_ptr = handle.get();
+  RegisterServiceWorkerRegistrationHandle(handle.Pass());
+  return handle_ptr;
 }
 
 void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
     int thread_id,
     int request_id,
     int provider_id,
     const GURL& pattern,
     const GURL& script_url) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerDispatcherHost::OnRegisterServiceWorker");
@@ skipping 500 matching lines @@
 
   ServiceWorkerRegistrationObjectInfo info;
   ServiceWorkerVersionAttributes attrs;
   GetRegistrationObjectInfoAndVersionAttributes(
       provider_host->AsWeakPtr(), registration, &info, &attrs);
 
   Send(new ServiceWorkerMsg_AssociateRegistrationWithServiceWorker(
       kDocumentMainThreadId, provider_id, info, attrs));
 }
 
-ServiceWorkerRegistrationHandle*
-ServiceWorkerDispatcherHost::FindRegistrationHandle(int provider_id,
-                                                    int64 registration_id) {
-  for (IDMap<ServiceWorkerRegistrationHandle, IDMapOwnPointer>::iterator
-           iter(&registration_handles_);
-       !iter.IsAtEnd();
-       iter.Advance()) {
-    ServiceWorkerRegistrationHandle* handle = iter.GetCurrentValue();
-    DCHECK(handle);
-    DCHECK(handle->registration());
-    if (handle->provider_id() == provider_id &&
-        handle->registration()->id() == registration_id) {
-      return handle;
-    }
-  }
-  return NULL;
-}
-
 void ServiceWorkerDispatcherHost::GetRegistrationObjectInfoAndVersionAttributes(
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     ServiceWorkerRegistration* registration,
     ServiceWorkerRegistrationObjectInfo* info,
     ServiceWorkerVersionAttributes* attrs) {
   ServiceWorkerRegistrationHandle* handle =
-    GetOrCreateRegistrationHandle(provider_host, registration);
+      CreateRegistrationHandle(provider_host, registration);
   *info = handle->GetObjectInfo();
 
   attrs->installing = provider_host->GetOrCreateServiceWorkerHandle(
       registration->installing_version());
   attrs->waiting = provider_host->GetOrCreateServiceWorkerHandle(
       registration->waiting_version());
   attrs->active = provider_host->GetOrCreateServiceWorkerHandle(
       registration->active_version());
 }
 
@@ skipping 452 matching lines @@
   if (!handle) {
     bad_message::ReceivedBadMessage(this,
                                     bad_message::SWDH_TERMINATE_BAD_HANDLE);
     return;
   }
   handle->version()->StopWorker(
       base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
 }
 
 }  // namespace content