Call EmbeddedWorkerDevToolsManager::ServiceWorkerCreated, WorkerContextStarted and WorkerDestroyed.

content/browser/devtools/embedded_worker_devtools_manager.cc

 // Copyright 2014 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/devtools/embedded_worker_devtools_manager.h"
 
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
@@ skipping 16 matching lines @@
     delete message;
     return false;
   }
   message->set_routing_id(worker_id.second);
   host->Send(message);
   return true;
 }
 
 }  // namespace
 
+EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
+    const ServiceWorkerContextCore* const service_worker_context,
+    int64 service_worker_version_id)
+    : service_worker_context_(service_worker_context),
+      service_worker_version_id_(service_worker_version_id) {
+}
+
+EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
+    const ServiceWorkerIdentifier& other)
+    : service_worker_context_(other.service_worker_context_),
+      service_worker_version_id_(other.service_worker_version_id_) {
+}
+
+bool EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::Matches(
+    const ServiceWorkerIdentifier& other) const {
+  return service_worker_context_ == other.service_worker_context_ &&
+         service_worker_version_id_ == other.service_worker_version_id_;
+}
+
 EmbeddedWorkerDevToolsManager::WorkerInfo::WorkerInfo(
     const SharedWorkerInstance& instance)
     : shared_worker_instance_(new SharedWorkerInstance(instance)),
       state_(WORKER_UNINSPECTED),
       agent_host_(NULL) {
 }
 
 EmbeddedWorkerDevToolsManager::WorkerInfo::WorkerInfo(
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope)
-    : storage_partition_path_(new base::FilePath(storage_partition_path)),
-      service_worker_scope_(new GURL(service_worker_scope)),
+    const ServiceWorkerIdentifier& service_worker_id)
+    : service_worker_id_(new ServiceWorkerIdentifier(service_worker_id)),
       state_(WORKER_UNINSPECTED),
       agent_host_(NULL) {
 }
 
 bool EmbeddedWorkerDevToolsManager::WorkerInfo::Matches(
     const SharedWorkerInstance& other) {
   if (!shared_worker_instance_)
     return false;
   return shared_worker_instance_->Matches(other);
 }
 
 bool EmbeddedWorkerDevToolsManager::WorkerInfo::Matches(
-    const base::FilePath& other_storage_partition_path,
-    const GURL& other_service_worker_scope) {
-  if (!storage_partition_path_ || !service_worker_scope_)
+    const ServiceWorkerIdentifier& other) {
+  if (!service_worker_id_)
     return false;
-  return *storage_partition_path_ == other_storage_partition_path &&
-         *service_worker_scope_ == other_service_worker_scope;
+  return service_worker_id_->Matches(other);
 }
 
 EmbeddedWorkerDevToolsManager::WorkerInfo::~WorkerInfo() {
 }
 
 class EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsAgentHost
     : public IPCDevToolsAgentHost,
       public IPC::Listener {
  public:
   explicit EmbeddedWorkerDevToolsAgentHost(WorkerId worker_id)
@@ skipping 91 matching lines @@
 
   EmbeddedWorkerDevToolsAgentHost* agent_host =
       new EmbeddedWorkerDevToolsAgentHost(id);
   info->set_agent_host(agent_host);
   info->set_state(WORKER_INSPECTED);
   return agent_host;
 }
 
 DevToolsAgentHost*
 EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForServiceWorker(
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
-  WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(
-      storage_partition_path, service_worker_scope);
+    const ServiceWorkerIdentifier& service_worker_id) {
+  WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(service_worker_id);
   if (it == workers_.end())
     return NULL;
   return GetDevToolsAgentHostForWorker(it->first.first, it->first.second);
 }
 
 EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsManager() {
 }
 
 EmbeddedWorkerDevToolsManager::~EmbeddedWorkerDevToolsManager() {
 }
@@ skipping 10 matching lines @@
     workers_.set(id, info.Pass());
     return false;
   }
   MoveToPausedState(id, it);
   return true;
 }
 
 bool EmbeddedWorkerDevToolsManager::ServiceWorkerCreated(
     int worker_process_id,
     int worker_route_id,
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
+    const ServiceWorkerIdentifier& service_worker_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(worker_process_id, worker_route_id);
-  WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(
-      storage_partition_path, service_worker_scope);
+  WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(service_worker_id);
   if (it == workers_.end()) {
-    scoped_ptr<WorkerInfo> info(
-        new WorkerInfo(storage_partition_path, service_worker_scope));
+    scoped_ptr<WorkerInfo> info(new WorkerInfo(service_worker_id));
     workers_.set(id, info.Pass());
     return false;
   }
   MoveToPausedState(id, it);
   return true;
 }
 
 void EmbeddedWorkerDevToolsManager::WorkerDestroyed(int worker_process_id,
                                                     int worker_route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 78 matching lines @@
   WorkerInfoMap::iterator it = workers_.begin();
   for (; it != workers_.end(); ++it) {
     if (it->second->Matches(instance))
       break;
   }
   return it;
 }
 
 EmbeddedWorkerDevToolsManager::WorkerInfoMap::iterator
 EmbeddedWorkerDevToolsManager::FindExistingServiceWorkerInfo(
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
+    const ServiceWorkerIdentifier& service_worker_id) {
   WorkerInfoMap::iterator it = workers_.begin();
   for (; it != workers_.end(); ++it) {
-    if (it->second->Matches(storage_partition_path, service_worker_scope))
+    if (it->second->Matches(service_worker_id))
       break;
   }
   return it;
 }
 
 void EmbeddedWorkerDevToolsManager::MoveToPausedState(
     const WorkerId& id,
     const WorkerInfoMap::iterator& it) {
   DCHECK_EQ(WORKER_TERMINATED, it->second->state());
   scoped_ptr<WorkerInfo> info = workers_.take_and_erase(it);
   info->set_state(WORKER_PAUSED);
   workers_.set(id, info.Pass());
 }
 
 void EmbeddedWorkerDevToolsManager::ResetForTesting() {
   workers_.clear();
 }
 
 }  // namespace content