Call EmbeddedWorkerDevToolsManager::ServiceWorkerCreated, WorkerContextStarted and WorkerDestroyed.

content/browser/devtools/embedded_worker_devtools_manager.cc

Index: content/browser/devtools/embedded_worker_devtools_manager.cc
diff --git a/content/browser/devtools/embedded_worker_devtools_manager.cc b/content/browser/devtools/embedded_worker_devtools_manager.cc
index 64f76249ee3d6ae4943bbe1ec2389d14b398ad07..871d8a774980b31400f798ef36040bf563b4451e 100644
--- a/content/browser/devtools/embedded_worker_devtools_manager.cc
+++ b/content/browser/devtools/embedded_worker_devtools_manager.cc
@@ -10,6 +10,7 @@
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/common/devtools_messages.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/worker_service.h"
@@ -37,15 +38,17 @@ bool SendMessageToWorker(
 EmbeddedWorkerDevToolsManager::WorkerInfo::WorkerInfo(
     const SharedWorkerInstance& instance)
     : shared_worker_instance_(new SharedWorkerInstance(instance)),
+      service_worker_context_(NULL),
+      service_worker_version_id_(kInvalidServiceWorkerVersionId),
       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 ServiceWorkerContextCore* const service_worker_context,
+    int64 service_worker_version_id)
+    : service_worker_context_(service_worker_context),
+      service_worker_version_id_(service_worker_version_id),
       state_(WORKER_UNINSPECTED),
       agent_host_(NULL) {
 }
@@ -58,12 +61,12 @@ bool EmbeddedWorkerDevToolsManager::WorkerInfo::Matches(
 }
 
 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 ServiceWorkerContextCore* const other_service_worker_context,
+    int64 other_service_worker_version_id) {
+  if (!service_worker_context_)
     return false;
-  return *storage_partition_path_ == other_storage_partition_path &&
-         *service_worker_scope_ == other_service_worker_scope;
+  return service_worker_context_ == other_service_worker_context &&
+         service_worker_version_id_ == other_service_worker_version_id;
 }
 
 EmbeddedWorkerDevToolsManager::WorkerInfo::~WorkerInfo() {
@@ -175,10 +178,10 @@ DevToolsAgentHost* EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
 
 DevToolsAgentHost*
 EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForServiceWorker(
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
+    const ServiceWorkerContextCore* const service_worker_context,
+    int64 service_worker_version_id) {
   WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(
-      storage_partition_path, service_worker_scope);
+      service_worker_context, service_worker_version_id);
   if (it == workers_.end())
     return NULL;
   return GetDevToolsAgentHostForWorker(it->first.first, it->first.second);
@@ -209,15 +212,15 @@ bool EmbeddedWorkerDevToolsManager::SharedWorkerCreated(
 bool EmbeddedWorkerDevToolsManager::ServiceWorkerCreated(
     int worker_process_id,
     int worker_route_id,
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
+    const ServiceWorkerContextCore* const service_worker_context,
+    int64 service_worker_version_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);
+      service_worker_context, service_worker_version_id);
   if (it == workers_.end()) {
     scoped_ptr<WorkerInfo> info(
-        new WorkerInfo(storage_partition_path, service_worker_scope));
+        new WorkerInfo(service_worker_context, service_worker_version_id));
     workers_.set(id, info.Pass());
     return false;
   }
@@ -316,11 +319,11 @@ EmbeddedWorkerDevToolsManager::FindExistingSharedWorkerInfo(
 
 EmbeddedWorkerDevToolsManager::WorkerInfoMap::iterator
 EmbeddedWorkerDevToolsManager::FindExistingServiceWorkerInfo(
-    const base::FilePath& storage_partition_path,
-    const GURL& service_worker_scope) {
+    const ServiceWorkerContextCore* const service_worker_context,
+    int64 service_worker_version_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_context, service_worker_version_id))
       break;
   }
   return it;