Split EmbeddedWorkerDevToolsAgentHost into two for Shared- and ServiceWorker

content/browser/devtools/embedded_worker_devtools_agent_host.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_AGENT_HOST_H_
 #define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_AGENT_HOST_H_
 
 #include "content/browser/devtools/embedded_worker_devtools_manager.h"
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
 #include "ipc/ipc_listener.h"
 
 namespace content {
 
 class BrowserContext;
 class SharedWorkerInstance;
 
 class EmbeddedWorkerDevToolsAgentHost : public IPCDevToolsAgentHost,
                                         public IPC::Listener {
  public:
   typedef EmbeddedWorkerDevToolsManager::WorkerId WorkerId;
   typedef EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier
       ServiceWorkerIdentifier;
 
   EmbeddedWorkerDevToolsAgentHost(WorkerId worker_id,

[horo, 2014/12/18 05:55:56]

remove this

[kinuko, 2014/12/18 06:24:54]

Done.

                                   const SharedWorkerInstance& shared_worker);
 
-  EmbeddedWorkerDevToolsAgentHost(WorkerId worker_id,
-                                  const ServiceWorkerIdentifier& service_worker,
-                                  bool debug_service_worker_on_start);
-
   // DevToolsAgentHost override.
   bool IsWorker() const override;
-  Type GetType() override;
-  std::string GetTitle() override;
-  GURL GetURL() override;
-  bool Activate() override;
-  bool Close() override;
   BrowserContext* GetBrowserContext() override;
 
   // IPCDevToolsAgentHost implementation.
   void SendMessageToAgent(IPC::Message* message) override;
   void Attach() override;
   void OnClientAttached() override;
   void OnClientDetached() override;
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   void WorkerReadyForInspection();
   void WorkerRestarted(WorkerId worker_id);
   void WorkerDestroyed();
-  bool Matches(const SharedWorkerInstance& other);
-  bool Matches(const ServiceWorkerIdentifier& other);
   bool IsTerminated();
 
- private:
+  // TODO(kinuko): Remove these virtual methods after we split devtools manager.
+  virtual bool Matches(const SharedWorkerInstance& other);
+  virtual bool Matches(const ServiceWorkerIdentifier& other);
+
+ protected:
   friend class EmbeddedWorkerDevToolsManagerTest;
 
+  EmbeddedWorkerDevToolsAgentHost(WorkerId worker_id);
   ~EmbeddedWorkerDevToolsAgentHost() override;
 
   enum WorkerState {
     WORKER_UNINSPECTED,
     WORKER_INSPECTED,
     WORKER_TERMINATED,
     WORKER_PAUSED_FOR_DEBUG_ON_START,
     WORKER_PAUSED_FOR_REATTACH,
   };
 
   void AttachToWorker();
   void DetachFromWorker();
   void WorkerCreated();
   void OnDispatchOnInspectorFrontend(const std::string& message,
                                      uint32 total_size);
   void OnSaveAgentRuntimeState(const std::string& state);
 
-  scoped_ptr<SharedWorkerInstance> shared_worker_;
-  scoped_ptr<ServiceWorkerIdentifier> service_worker_;
+  void set_state(WorkerState state) { state_ = state; }
+  const WorkerId& worker_id() const { return worker_id_; }
+
+ private:
   WorkerState state_;
   WorkerId worker_id_;
   std::string saved_agent_state_;
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsAgentHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_AGENT_HOST_H_