ServiceWorker: Make GetOrCreateRegistrationHandle for refactoring

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/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/message_port_message_filter.h"
@@ skipping 151 matching lines @@
   if (channel_ready_) {
     BrowserMessageFilter::Send(message);
     // Don't bother passing through Send()'s result: it's not reliable.
     return true;
   }
 
   pending_messages_.push_back(message);
   return true;
 }
 
+ServiceWorkerRegistrationHandle*
+ServiceWorkerDispatcherHost::GetOrCreateRegistrationHandle(
+    int provider_id,
+    ServiceWorkerRegistration* registration) {
+  ServiceWorkerRegistrationHandle* handle =
+      FindRegistrationHandle(provider_id, registration->id());
+  if (handle) {
+    handle->IncrementRefCount();
+    return handle;
+  }
+
+  scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
+      new ServiceWorkerRegistrationHandle(
+          GetContext()->AsWeakPtr(), this, provider_id, registration));
+  handle = new_handle.get();
+  RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
+  return handle;
+}
+
 void ServiceWorkerDispatcherHost::RegisterServiceWorkerHandle(
     scoped_ptr<ServiceWorkerHandle> handle) {
   int handle_id = handle->handle_id();
   handles_.AddWithID(handle.release(), handle_id);
 }
 
 void ServiceWorkerDispatcherHost::RegisterServiceWorkerRegistrationHandle(
     scoped_ptr<ServiceWorkerRegistrationHandle> handle) {
   int handle_id = handle->handle_id();
   registration_handles_.AddWithID(handle.release(), handle_id);
@@ skipping 202 matching lines @@
   if (status != SERVICE_WORKER_OK) {
     SendRegistrationError(thread_id, request_id, status);
     return;
   }
 
   ServiceWorkerRegistration* registration =
       GetContext()->GetLiveRegistration(registration_id);
   DCHECK(registration);
 
   ServiceWorkerRegistrationHandle* handle =
-      FindRegistrationHandle(provider_id, registration_id);
-  ServiceWorkerRegistrationObjectInfo info;
-  if (handle) {
-    handle->IncrementRefCount();
-    info = handle->GetObjectInfo();
-  } else {
-    scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
-        new ServiceWorkerRegistrationHandle(
-            GetContext()->AsWeakPtr(), this, provider_id, registration));
-    info = new_handle->GetObjectInfo();
-    handle = new_handle.get();
-    RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
-  }
+      GetOrCreateRegistrationHandle(provider_id, registration);
 
   ServiceWorkerVersionAttributes attrs;
   attrs.installing = handle->CreateServiceWorkerHandleAndPass(
       registration->installing_version());
   attrs.waiting = handle->CreateServiceWorkerHandleAndPass(
       registration->waiting_version());
   attrs.active = handle->CreateServiceWorkerHandleAndPass(
       registration->active_version());
 
   Send(new ServiceWorkerMsg_ServiceWorkerRegistered(
-      thread_id, request_id, info, attrs));
+      thread_id, request_id, handle->GetObjectInfo(), attrs));
   TRACE_EVENT_ASYNC_END2("ServiceWorker",
                          "ServiceWorkerDispatcherHost::RegisterServiceWorker",
                          request_id,
                          "Registration ID", registration_id,
                          "Version ID", version_id);
 }
 
 void ServiceWorkerDispatcherHost::OnWorkerReadyForInspection(
     int embedded_worker_id) {
   TRACE_EVENT0("ServiceWorker",
@@ skipping 195 matching lines @@
       status, &error_type, &error_message);
   Send(new ServiceWorkerMsg_ServiceWorkerUnregistrationError(
       thread_id, request_id, error_type, error_message));
 }
 
 ServiceWorkerContextCore* ServiceWorkerDispatcherHost::GetContext() {
   return context_wrapper_->context();
 }
 
 }  // namespace content