ServiceWorker: propagate provider_id to the browser process in .register + int32/int cleanup

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/strings/utf_string_conversions.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
@@ skipping 100 matching lines @@
 
   return handled;
 }
 
 int ServiceWorkerDispatcherHost::RegisterServiceWorkerHandle(
     scoped_ptr<ServiceWorkerHandle> handle) {
   return handles_.Add(handle.release());
 }
 
 void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
-    int32 thread_id,
-    int32 request_id,
+    int thread_id,
+    int request_id,
+    int provider_id,
     const GURL& pattern,
     const GURL& script_url) {
   if (!context_ || !ServiceWorkerUtils::IsFeatureEnabled()) {
     Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
         thread_id,
         request_id,
         WebServiceWorkerError::DisabledError,
         base::ASCIIToUTF16(kDisabledErrorMessage)));
     return;
   }
 
   // TODO(alecflett): This check is insufficient for release. Add a
   // ServiceWorker-specific policy query in
   // ChildProcessSecurityImpl. See http://crbug.com/311631.
   if (pattern.GetOrigin() != script_url.GetOrigin()) {
     Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
         thread_id,
         request_id,
         WebServiceWorkerError::SecurityError,
         base::ASCIIToUTF16(kDomainMismatchErrorMessage)));
     return;
   }
 
+  ServiceWorkerProviderHost* provider_host = context_->GetProviderHost(
+      render_process_id_, provider_id);
+  if (!provider_host) {
+    BadMessageReceived();
+    return;
+  }
+
   context_->RegisterServiceWorker(
       pattern,
       script_url,
       render_process_id_,
+      provider_host,
       base::Bind(&ServiceWorkerDispatcherHost::RegistrationComplete,
                  this,
                  thread_id,
                  request_id));
 }
 
 void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(
-    int32 thread_id,
-    int32 request_id,
+    int thread_id,
+    int request_id,
+    int provider_id,
     const GURL& pattern) {
   // TODO(alecflett): This check is insufficient for release. Add a
   // ServiceWorker-specific policy query in
   // ChildProcessSecurityImpl. See http://crbug.com/311631.
   if (!context_ || !ServiceWorkerUtils::IsFeatureEnabled()) {
     Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
         thread_id,
         request_id,
         blink::WebServiceWorkerError::DisabledError,
         base::ASCIIToUTF16(kDisabledErrorMessage)));
     return;
   }
 
+  ServiceWorkerProviderHost* provider_host = context_->GetProviderHost(
+      render_process_id_, provider_id);
+  if (!provider_host) {
+    BadMessageReceived();
+    return;
+  }
+
   context_->UnregisterServiceWorker(
       pattern,
       render_process_id_,
+      provider_host,
       base::Bind(&ServiceWorkerDispatcherHost::UnregistrationComplete,
                  this,
                  thread_id,
                  request_id));
 }
 
 void ServiceWorkerDispatcherHost::OnPostMessage(
     int handle_id,
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids) {
@@ skipping 71 matching lines @@
     return;
   ServiceWorkerProviderHost* provider_host =
       context_->GetProviderHost(render_process_id_, provider_id);
   if (!provider_host || !provider_host->SetHostedVersionId(version_id)) {
     BadMessageReceived();
     return;
   }
 }
 
 void ServiceWorkerDispatcherHost::RegistrationComplete(
-    int32 thread_id,
-    int32 request_id,
+    int thread_id,
+    int request_id,
     ServiceWorkerStatusCode status,
     int64 registration_id,
     int64 version_id) {
   if (!context_)
     return;
 
   if (status != SERVICE_WORKER_OK) {
     SendRegistrationError(thread_id, request_id, status);
     return;
   }
@@ skipping 43 matching lines @@
   DVLOG(2) << "[Error] " << error_message << " (" << source_url
            << ":" << line_number << "," << column_number << ")";
 }
 
 void ServiceWorkerDispatcherHost::OnServiceWorkerObjectDestroyed(
     int handle_id) {
   handles_.Remove(handle_id);
 }
 
 void ServiceWorkerDispatcherHost::UnregistrationComplete(
-    int32 thread_id,
-    int32 request_id,
+    int thread_id,
+    int request_id,
     ServiceWorkerStatusCode status) {
   if (status != SERVICE_WORKER_OK) {
     SendRegistrationError(thread_id, request_id, status);
     return;
   }
 
   Send(new ServiceWorkerMsg_ServiceWorkerUnregistered(thread_id, request_id));
 }
 
 void ServiceWorkerDispatcherHost::SendRegistrationError(
-    int32 thread_id,
-    int32 request_id,
+    int thread_id,
+    int request_id,
     ServiceWorkerStatusCode status) {
   base::string16 error_message;
   blink::WebServiceWorkerError::ErrorType error_type;
   GetServiceWorkerRegistrationStatusResponse(
       status, &error_type, &error_message);
   Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
       thread_id, request_id, error_type, error_message));
 }
 
 }  // namespace content