Revert 272142 "Save running SW instance info, including its Site..."

trunk/src/content/browser/service_worker/embedded_worker_instance.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_instance.h"
 
 #include "base/bind_helpers.h"
 #include "content/browser/devtools/embedded_worker_devtools_manager.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ skipping 75 matching lines @@
 }
 
 }  // namespace
 
 EmbeddedWorkerInstance::~EmbeddedWorkerInstance() {
   if (status_ == STARTING || status_ == RUNNING)
     Stop();
   if (worker_devtools_agent_route_id_ != MSG_ROUTING_NONE)
     NotifyWorkerDestroyed(process_id_, worker_devtools_agent_route_id_);
   if (context_ && process_id_ != -1)
-    context_->process_manager()->ReleaseWorkerProcess(embedded_worker_id_);
+    context_->process_manager()->ReleaseWorkerProcess(process_id_);
   registry_->RemoveWorker(process_id_, embedded_worker_id_);
 }
 
 void EmbeddedWorkerInstance::Start(int64 service_worker_version_id,
                                    const GURL& scope,
                                    const GURL& script_url,
                                    const std::vector<int>& possible_process_ids,
                                    const StatusCallback& callback) {
   if (!context_) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   DCHECK(status_ == STOPPED);
   status_ = STARTING;
   scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       new EmbeddedWorkerMsg_StartWorker_Params());
   params->embedded_worker_id = embedded_worker_id_;
   params->service_worker_version_id = service_worker_version_id;
   params->scope = scope;
   params->script_url = script_url;
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   params->pause_on_start = false;
   context_->process_manager()->AllocateWorkerProcess(
-      embedded_worker_id_,
       SortProcesses(possible_process_ids),
       script_url,
       base::Bind(&EmbeddedWorkerInstance::RunProcessAllocated,
                  weak_factory_.GetWeakPtr(),
                  context_,
                  base::Passed(&params),
                  callback));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() {
@@ skipping 49 matching lines @@
     base::WeakPtr<ServiceWorkerContextCore> context,
     scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
     const EmbeddedWorkerInstance::StatusCallback& callback,
     ServiceWorkerStatusCode status,
     int process_id) {
   if (!context) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   if (!instance) {
-    if (status == SERVICE_WORKER_OK) {
-      // We only have a process allocated if the status is OK.
-      context->process_manager()->ReleaseWorkerProcess(
-          params->embedded_worker_id);
-    }
+    context->process_manager()->ReleaseWorkerProcess(process_id);
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   instance->ProcessAllocated(params.Pass(), callback, process_id, status);
 }
 
 void EmbeddedWorkerInstance::ProcessAllocated(
     scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
     const StatusCallback& callback,
     int process_id,
@@ skipping 42 matching lines @@
   DCHECK(status_ == STARTING);
   status_ = RUNNING;
   thread_id_ = thread_id;
   FOR_EACH_OBSERVER(Listener, listener_list_, OnStarted());
 }
 
 void EmbeddedWorkerInstance::OnStopped() {
   if (worker_devtools_agent_route_id_ != MSG_ROUTING_NONE)
     NotifyWorkerDestroyed(process_id_, worker_devtools_agent_route_id_);
   if (context_)
-    context_->process_manager()->ReleaseWorkerProcess(embedded_worker_id_);
+    context_->process_manager()->ReleaseWorkerProcess(process_id_);
   status_ = STOPPED;
   process_id_ = -1;
   thread_id_ = -1;
   worker_devtools_agent_route_id_ = MSG_ROUTING_NONE;
   FOR_EACH_OBSERVER(Listener, listener_list_, OnStopped());
 }
 
 bool EmbeddedWorkerInstance::OnMessageReceived(const IPC::Message& message) {
   ListenerList::Iterator it(listener_list_);
   while (Listener* listener = it.GetNext()) {
@@ skipping 51 matching lines @@
   // Sort descending by the reference count.
   std::sort(counted.begin(), counted.end(), SecondGreater());
 
   std::vector<int> result(counted.size());
   for (size_t i = 0; i < counted.size(); ++i)
     result[i] = counted[i].first;
   return result;
 }
 
 }  // namespace content