Split EmbeddedWorkerDevToolsManager into two for Shared- and ServiceWorker

content/browser/devtools/service_worker_devtools_agent_host.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/service_worker_devtools_agent_host.h"
 
 #include "base/strings/stringprintf.h"
+#include "content/browser/devtools/service_worker_devtools_manager.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace content {
 
 namespace {
 
 void StatusNoOp(ServiceWorkerStatusCode status) {}
@@ skipping 16 matching lines @@
       version->SetDevToolsAttached(attached);
   }
 }
 
 }  // namespace
 
 ServiceWorkerDevToolsAgentHost::ServiceWorkerDevToolsAgentHost(
     WorkerId worker_id,
     const ServiceWorkerIdentifier& service_worker,
     bool debug_service_worker_on_start)
-    : EmbeddedWorkerDevToolsAgentHost(worker_id),
+    : WorkerDevToolsAgentHost(worker_id),
       service_worker_(new ServiceWorkerIdentifier(service_worker)) {
   if (debug_service_worker_on_start)
     set_state(WORKER_PAUSED_FOR_DEBUG_ON_START);
 }
 
 DevToolsAgentHost::Type ServiceWorkerDevToolsAgentHost::GetType() {
   return TYPE_SERVICE_WORKER;
 }
 
 std::string ServiceWorkerDevToolsAgentHost::GetTitle() {
@@ skipping 14 matching lines @@
 
 bool ServiceWorkerDevToolsAgentHost::Close() {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&TerminateServiceWorkerOnIO,
                   service_worker_->context_weak(),
                   service_worker_->version_id()));
   return true;
 }
 
 void ServiceWorkerDevToolsAgentHost::OnClientAttached() {
-  EmbeddedWorkerDevToolsAgentHost::OnClientAttached();
+  WorkerDevToolsAgentHost::OnClientAttached();
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&SetDevToolsAttachedOnIO,
                   service_worker_->context_weak(),
                   service_worker_->version_id(),
                   true));
 }
 
 void ServiceWorkerDevToolsAgentHost::OnClientDetached() {
-  EmbeddedWorkerDevToolsAgentHost::OnClientDetached();
+  WorkerDevToolsAgentHost::OnClientDetached();
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&SetDevToolsAttachedOnIO,
                   service_worker_->context_weak(),
                   service_worker_->version_id(),
                   false));
 }
 
 bool ServiceWorkerDevToolsAgentHost::Matches(
     const ServiceWorkerIdentifier& other) {
   return service_worker_->Matches(other);
 }
 
 ServiceWorkerDevToolsAgentHost::~ServiceWorkerDevToolsAgentHost() {
+  ServiceWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
+      worker_id());
 }
 
 }  // namespace content