Start EmbeddedWorker during registration - take 2

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/stl_util.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 
 namespace content {
 
 EmbeddedWorkerRegistry::EmbeddedWorkerRegistry(
     base::WeakPtr<ServiceWorkerContextCore> context)
     : context_(context),
       next_embedded_worker_id_(0) {}
 
 scoped_ptr<EmbeddedWorkerInstance> EmbeddedWorkerRegistry::CreateWorker() {
   scoped_ptr<EmbeddedWorkerInstance> worker(
       new EmbeddedWorkerInstance(this, next_embedded_worker_id_));
+  LOG(ERROR) << "Adding EmbeddedWorkerInstance with id "
+             << next_embedded_worker_id_;
   worker_map_[next_embedded_worker_id_++] = worker.get();
   return worker.Pass();
 }
 
 bool EmbeddedWorkerRegistry::StartWorker(
     int process_id,
     int embedded_worker_id,
     int64 service_worker_version_id,
     const GURL& script_url,
     const IPC::Message& initialize_message) {
   return Send(process_id,
               new EmbeddedWorkerMsg_StartWorker(embedded_worker_id,
                                                service_worker_version_id,
                                                script_url,
                                                initialize_message));
 }
 
 bool EmbeddedWorkerRegistry::StopWorker(int process_id,
                                         int embedded_worker_id) {
   return Send(process_id,
               new EmbeddedWorkerMsg_StopWorker(embedded_worker_id));
 }
 
 void EmbeddedWorkerRegistry::OnWorkerStarted(
     int process_id, int thread_id, int embedded_worker_id) {
+  LOG(ERROR) << "OnWorkerStarted(" << process_id << ", " << thread_id << ", "
+             << embedded_worker_id << ")";
   DCHECK(!ContainsKey(worker_process_map_, process_id));
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   worker_process_map_[process_id] = embedded_worker_id;
   DCHECK_EQ(found->second->process_id(), process_id);
   found->second->OnStarted(thread_id);
 }
@@ skipping 33 matching lines @@
     int embedded_worker_id = found->second;
     DCHECK(ContainsKey(worker_map_, embedded_worker_id));
     worker_map_[embedded_worker_id]->OnStopped();
     worker_process_map_.erase(found);
   }
 }
 
 EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {}
 
 bool EmbeddedWorkerRegistry::Send(int process_id, IPC::Message* message) {
-  if (!context_)
+  if (!context_) {
+    LOG(ERROR) << "No context, bailing on the send";
     return false;
+  }
   ProcessToSenderMap::iterator found = process_sender_map_.find(process_id);
-  if (found == process_sender_map_.end())
+  if (found == process_sender_map_.end()) {
+    LOG(ERROR) << "sender not found for pid " << process_id;
     return false;
+  }
+  LOG(ERROR) << "Sending message to " << process_id;
   return found->second->Send(message);
 }
 
 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