Minor clean up in WorkerDevToolsManager

content/browser/devtools/worker_devtools_manager.cc

 // Copyright (c) 2011 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/worker_devtools_manager.h"
 
 #include <list>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
   string16 worker_name;
 };
 
 
 class WorkerDevToolsManager::WorkerDevToolsAgentHost
     : public IPCDevToolsAgentHost {
  public:
   explicit WorkerDevToolsAgentHost(WorkerId worker_id)
       : has_worker_id_(false) {
     SetWorkerId(worker_id, false);
-    AddRef();  //  Balanced in ResetWorkerId.
   }
 
   void SetWorkerId(WorkerId worker_id, bool reattach) {
     worker_id_ = worker_id;
+    if (!has_worker_id_)
+      AddRef();  //  Balanced in ResetWorkerId.
     has_worker_id_ = true;
     g_agent_map.Get()[worker_id_] = this;
 
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(
             &ConnectToWorker,
             worker_id.first,
             worker_id.second));
 
     if (reattach)
       Reattach(state_);
   }
 
   void ResetWorkerId() {
     g_agent_map.Get().erase(worker_id_);
     has_worker_id_ = false;
-    Release();
+    Release();  //  Balanced in SetWorkerId.
   }
 
   void SaveAgentRuntimeState(const std::string& state) {
     state_ = state;
   }
 
   void ConnectionFailed() {
     NotifyCloseListener();
     // Object can be deleted here.
   }
 
  private:
-  virtual ~WorkerDevToolsAgentHost() {
-    g_agent_map.Get().erase(worker_id_);

[yurys, 2013/04/15 05:24:18]

Why did this move?

[Vladislav Kaznacheev, 2013/04/15 13:10:27]

Because I needed to call a method from DetachedClientHosts which is declared
below. Other ways to untangle this are even more verbose.

On 2013/04/15 05:24:18, Yury Semikhatsky wrote:

-    g_orphan_map.Get().erase(worker_id_);
-  }
+  virtual ~WorkerDevToolsAgentHost();
 
   static void ConnectToWorker(
       int worker_process_id,
       int worker_route_id) {
     WorkerDevToolsManager::GetInstance()->ConnectDevToolsAgentHostToWorker(
         worker_process_id, worker_route_id);
   }
 
   static void ForwardToWorkerDevToolsAgent(
       int worker_process_id,
@@ skipping 59 matching lines @@
     }
 
     // Client host is debugging this worker agent host.
     devtools_manager->DispatchOnInspectorFrontend(
         agent,
         WebDevToolsAgent::workerDisconnectedFromWorkerEvent().utf8());
     g_orphan_map.Get()[id] = agent;
     agent->ResetWorkerId();
   }
 
- private:
-  DetachedClientHosts() {}
-  ~DetachedClientHosts() {}
-
   static void RemovePendingWorkerData(WorkerId id) {

[yurys, 2013/04/15 05:24:18]

Why do you need this method to be public?

     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&RemoveInspectedWorkerDataOnIOThread, id));
   }
 
+ private:
+  DetachedClientHosts() {}
+  ~DetachedClientHosts() {}
+
   static void RemoveInspectedWorkerDataOnIOThread(WorkerId id) {
     WorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(id);
   }
 };
 
 struct WorkerDevToolsManager::InspectedWorker {
   InspectedWorker(WorkerProcessHost* host, int route_id, const GURL& url,
                   const string16& name)
       : host(host),
         route_id(route_id),
@@ skipping 231 matching lines @@
   if (it != g_agent_map.Get().end())
     it->second->ConnectionFailed();
 }
 
 // static
 void WorkerDevToolsManager::SendResumeToWorker(const WorkerId& id) {
   if (WorkerProcessHost* process = FindWorkerProcess(id.first))
     process->Send(new DevToolsAgentMsg_ResumeWorkerContext(id.second));
 }
 
+WorkerDevToolsManager::WorkerDevToolsAgentHost::~WorkerDevToolsAgentHost() {
+  DetachedClientHosts::RemovePendingWorkerData(worker_id_);
+  g_agent_map.Get().erase(worker_id_);
+  g_orphan_map.Get().erase(worker_id_);
+}
+
 }  // namespace content