| Index: content/browser/service_worker/embedded_worker_registry.cc
|
| diff --git a/content/browser/service_worker/embedded_worker_registry.cc b/content/browser/service_worker/embedded_worker_registry.cc
|
| index f204a206c6e7ee5c7b675bfbccfedd1dfe206635..88076415fc76b4e9ef60725512034b5adf3529ba 100644
|
| --- a/content/browser/service_worker/embedded_worker_registry.cc
|
| +++ b/content/browser/service_worker/embedded_worker_registry.cc
|
| @@ -42,12 +42,6 @@ scoped_ptr<EmbeddedWorkerInstance> EmbeddedWorkerRegistry::CreateWorker() {
|
| return worker.Pass();
|
| }
|
|
|
| -ServiceWorkerStatusCode EmbeddedWorkerRegistry::StopWorker(
|
| - int process_id, int embedded_worker_id) {
|
| - return Send(process_id,
|
| - new EmbeddedWorkerMsg_StopWorker(embedded_worker_id));
|
| -}
|
| -
|
| bool EmbeddedWorkerRegistry::OnMessageReceived(const IPC::Message& message,
|
| int process_id) {
|
| // TODO(kinuko): Move all EmbeddedWorker message handling from
|
| @@ -233,18 +227,13 @@ EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {
|
| Shutdown();
|
| }
|
|
|
| -ServiceWorkerStatusCode EmbeddedWorkerRegistry::SendStartWorker(
|
| - scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
|
| - int process_id) {
|
| - if (!context_)
|
| - return SERVICE_WORKER_ERROR_ABORT;
|
| -
|
| +void EmbeddedWorkerRegistry::WorkerStarting(int embedded_worker_id,
|
| + int process_id) {
|
| // The ServiceWorkerDispatcherHost is supposed to be created when the process
|
| // is created, and keep an entry in process_sender_map_ for its whole
|
| // lifetime.
|
| DCHECK(ContainsKey(process_sender_map_, process_id));
|
|
|
| - int embedded_worker_id = params->embedded_worker_id;
|
| WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
|
| DCHECK(found != worker_map_.end());
|
| DCHECK_EQ(found->second->process_id(), process_id);
|
| @@ -252,11 +241,7 @@ ServiceWorkerStatusCode EmbeddedWorkerRegistry::SendStartWorker(
|
| DCHECK(!ContainsKey(worker_process_map_, process_id) ||
|
| worker_process_map_[process_id].count(embedded_worker_id) == 0);
|
|
|
| - ServiceWorkerStatusCode status =
|
| - Send(process_id, new EmbeddedWorkerMsg_StartWorker(*params));
|
| - if (status == SERVICE_WORKER_OK)
|
| - worker_process_map_[process_id].insert(embedded_worker_id);
|
| - return status;
|
| + worker_process_map_[process_id].insert(embedded_worker_id);
|
| }
|
|
|
| ServiceWorkerStatusCode EmbeddedWorkerRegistry::Send(
|
|
|