DevTools: Merge WorkerInfo into EmbeddedWorkerDevToolsAgentHost

content/browser/devtools/embedded_worker_devtools_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
 #define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
 
+#include <map>
+
 #include "base/basictypes.h"
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class DevToolsAgentHost;
@@ skipping 50 matching lines @@
   bool debug_service_worker_on_start() const {
     return debug_service_worker_on_start_;
   }
 
  private:
   friend struct DefaultSingletonTraits<EmbeddedWorkerDevToolsManager>;
   friend class EmbeddedWorkerDevToolsManagerTest;
   FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, BasicTest);
   FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, AttachTest);
 
   enum WorkerState {

[horo, 2014/08/06 07:47:50]

nit: Move this to .cc.

[vkuzkokov, 2014/08/06 09:07:39]

Done.

     WORKER_UNINSPECTED,
     WORKER_INSPECTED,
     WORKER_TERMINATED,
     WORKER_PAUSED_FOR_DEBUG_ON_START,
     WORKER_PAUSED_FOR_REATTACH,
   };
 
-  class WorkerInfo {
-   public:
-    // Creates WorkerInfo for SharedWorker.
-    explicit WorkerInfo(const SharedWorkerInstance& instance);
-    // Creates WorkerInfo for ServiceWorker.
-    explicit WorkerInfo(const ServiceWorkerIdentifier& service_worker_id);
-    ~WorkerInfo();
-
-    WorkerState state() { return state_; }
-    void set_state(WorkerState new_state) { state_ = new_state; }
-    EmbeddedWorkerDevToolsAgentHost* agent_host() { return agent_host_; }
-    void set_agent_host(EmbeddedWorkerDevToolsAgentHost* agent_host) {
-      agent_host_ = agent_host;
-    }
-    bool Matches(const SharedWorkerInstance& other);
-    bool Matches(const ServiceWorkerIdentifier& other);
-
-   private:
-    scoped_ptr<SharedWorkerInstance> shared_worker_instance_;
-    scoped_ptr<ServiceWorkerIdentifier> service_worker_id_;
-    WorkerState state_;
-    EmbeddedWorkerDevToolsAgentHost* agent_host_;
-  };
-
-  typedef base::ScopedPtrHashMap<WorkerId, WorkerInfo> WorkerInfoMap;
+  typedef std::map<WorkerId, EmbeddedWorkerDevToolsAgentHost*> WorkerInfoMap;

[horo, 2014/08/06 07:47:50]

I think if you use 
std::map<WorkerId, scoped_refptr<EmbeddedWorkerDevToolsAgentHost>>
you don't need to call AddRef() and Release() of
EmbeddedWorkerDevToolsAgentHost.

[horo, 2014/08/06 07:47:50]

nit: I prefer WorkerAgentHostMap.

[vkuzkokov, 2014/08/06 09:07:39]

workers_ keeps live instances of EWDTAH. they are added to workers_ on creation
and removed in destructor. workers_ doesn't control lifetime of EWDTAH; it's the
opposite.

AddRef and Release are unrelated to that. They keep alive agent while its worker
is alive.

[vkuzkokov, 2014/08/06 09:07:39]

AgentHostMap.

[horo, 2014/08/06 10:08:40]

I see.
Sorry I misunderstood

 
   EmbeddedWorkerDevToolsManager();
   virtual ~EmbeddedWorkerDevToolsManager();
 
   void RemoveInspectedWorkerData(EmbeddedWorkerDevToolsAgentHost* agent_host);
 
   WorkerInfoMap::iterator FindExistingSharedWorkerInfo(
       const SharedWorkerInstance& instance);
   WorkerInfoMap::iterator FindExistingServiceWorkerInfo(
       const ServiceWorkerIdentifier& service_worker_id);
 
-  void MoveToPausedState(const WorkerId& id, const WorkerInfoMap::iterator& it);
+  void WorkerRestarted(const WorkerId& id, const WorkerInfoMap::iterator& it);
 
   // Resets to its initial state as if newly created.
   void ResetForTesting();
 
   WorkerInfoMap workers_;
 
   bool debug_service_worker_on_start_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_