Allow the browser to Send messages to an embedded worker once the script as been loaded without hav…

content/browser/service_worker/embedded_worker_registry.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/embedded_worker_registry.h"
 
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
@@ skipping 66 matching lines @@
     return;
   }
   if (found->second->process_id() != process_id) {
     LOG(ERROR) << "Incorrect embedded_worker_id";
     return;
   }
   found->second->OnReadyForInspection();
 }
 
 void EmbeddedWorkerRegistry::OnWorkerScriptLoaded(int process_id,
-                                                  int embedded_worker_id) {
+                                                  int thread_id,
+                                                  int embedded_worker_id ) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   if (found->second->process_id() != process_id) {
     LOG(ERROR) << "Incorrect embedded_worker_id";
     return;
   }
-  found->second->OnScriptLoaded();
+  found->second->OnScriptLoaded(thread_id);
 }
 
 void EmbeddedWorkerRegistry::OnWorkerScriptLoadFailed(int process_id,
                                                       int embedded_worker_id) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   if (found->second->process_id() != process_id) {
     LOG(ERROR) << "Incorrect embedded_worker_id";
     return;
   }
   found->second->OnScriptLoadFailed();
 }
 
 void EmbeddedWorkerRegistry::OnWorkerStarted(
-    int process_id, int thread_id, int embedded_worker_id) {
+    int process_id, int embedded_worker_id) {
   DCHECK(!ContainsKey(worker_process_map_, process_id) ||
          worker_process_map_[process_id].count(embedded_worker_id) == 0);
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   if (found->second->process_id() != process_id) {
     LOG(ERROR) << "Incorrect embedded_worker_id";
     return;
   }
   worker_process_map_[process_id].insert(embedded_worker_id);
-  found->second->OnStarted(thread_id);
+  found->second->OnStarted();
 }
 
-void EmbeddedWorkerRegistry::OnWorkerStopped(
-    int process_id, int embedded_worker_id) {
+void EmbeddedWorkerRegistry::OnWorkerStopped(int process_id,
+                                             int embedded_worker_id) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   if (found->second->process_id() != process_id) {
     LOG(ERROR) << "Incorrect embedded_worker_id";
     return;
   }
   worker_process_map_[process_id].erase(embedded_worker_id);
@@ skipping 121 matching lines @@
 }
 
 void EmbeddedWorkerRegistry::RemoveWorker(int process_id,
                                           int embedded_worker_id) {
   DCHECK(ContainsKey(worker_map_, embedded_worker_id));
   worker_map_.erase(embedded_worker_id);
   worker_process_map_.erase(process_id);
 }
 
 }  // namespace content