[DevTools] Split auto-attach part of TargetHandler into a separate class

content/browser/devtools/protocol/target_auto_attacher.h

Index: content/browser/devtools/protocol/target_auto_attacher.h
diff --git a/content/browser/devtools/protocol/target_handler.h b/content/browser/devtools/protocol/target_auto_attacher.h
similarity index 20%
copy from content/browser/devtools/protocol/target_handler.h
copy to content/browser/devtools/protocol/target_auto_attacher.h
index e932461716538896c12e7685adaffb714cfd4780..3262a65241b6989eac627f7e3a5be63932de6a55 100644
--- a/content/browser/devtools/protocol/target_handler.h
+++ b/content/browser/devtools/protocol/target_auto_attacher.h
@@ -1,88 +1,45 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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_PROTOCOL_TARGET_HANDLER_H_
-#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_HANDLER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_AUTO_ATTACHER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_AUTO_ATTACHER_H_
 
-#include <map>
-#include <set>
-
-#include "content/browser/devtools/protocol/devtools_domain_handler.h"
-#include "content/browser/devtools/protocol/target.h"
+#include "base/containers/flat_set.h"
 #include "content/browser/devtools/service_worker_devtools_manager.h"
-#include "content/public/browser/devtools_agent_host_client.h"
-#include "content/public/browser/devtools_agent_host_observer.h"
+#include "content/public/browser/devtools_agent_host.h"
 
 namespace content {
 
-class DevToolsAgentHostImpl;
 class RenderFrameHostImpl;
 
 namespace protocol {
 
-class TargetHandler : public DevToolsDomainHandler,
-                      public Target::Backend,
-                      public DevToolsAgentHostClient,
-                      public ServiceWorkerDevToolsManager::Observer,
-                      public DevToolsAgentHostObserver {
+class TargetAutoAttacher : public ServiceWorkerDevToolsManager::Observer {
  public:
-  TargetHandler();
-  ~TargetHandler() override;
+  // Second parameter is |waiting_for_debugger|, returns whether it succeeded.
+  using AttachCallback = base::Callback<bool(DevToolsAgentHost*, bool)>;

[caseq, 2017/07/07 17:46:33]

nit: consider introducing client interface instead.

[dgozman, 2017/07/13 21:46:21]

Acknowledged.

+  using DetachCallback = base::Callback<void(DevToolsAgentHost*)>;
 
-  static std::vector<TargetHandler*> ForAgentHost(DevToolsAgentHostImpl* host);
+  TargetAutoAttacher(AttachCallback attach_callback,
+                     DetachCallback detach_callback);
+  ~TargetAutoAttacher() override;
 
-  void Wire(UberDispatcher* dispatcher) override;
-  void SetRenderFrameHost(RenderFrameHostImpl* host) override;
-  Response Disable() override;
+  void SetRenderFrameHost(RenderFrameHostImpl* host);
+  void SetAutoAttach(bool auto_attach, bool wait_for_debugger_on_start);
+  void SetAttachToFrames(bool attach_to_frames);
 
   void UpdateServiceWorkers();
   void UpdateFrames();
-
-  // Domain implementation.
-  Response SetDiscoverTargets(bool discover) override;
-  Response SetAutoAttach(bool auto_attach,
-                         bool wait_for_debugger_on_start) override;
-  Response SetAttachToFrames(bool value) override;
-  Response SetRemoteLocations(
-      std::unique_ptr<protocol::Array<Target::RemoteLocation>>) override;
-  Response AttachToTarget(const std::string& target_id,
-                          bool* out_success) override;
-  Response DetachFromTarget(const std::string& target_id) override;
-  Response SendMessageToTarget(const std::string& target_id,
-                               const std::string& message) override;
-  Response GetTargetInfo(
-      const std::string& target_id,
-      std::unique_ptr<Target::TargetInfo>* target_info) override;
-  Response ActivateTarget(const std::string& target_id) override;
-  Response CloseTarget(const std::string& target_id,
-                       bool* out_success) override;
-  Response CreateBrowserContext(std::string* out_context_id) override;
-  Response DisposeBrowserContext(const std::string& context_id,
-                                 bool* out_success) override;
-  Response CreateTarget(const std::string& url,
-                        Maybe<int> width,
-                        Maybe<int> height,
-                        Maybe<std::string> context_id,
-                        std::string* out_target_id) override;
-  Response GetTargets(
-      std::unique_ptr<protocol::Array<Target::TargetInfo>>* target_infos)
-      override;
+  void AgentHostClosed(DevToolsAgentHost* host);
 
  private:
-  using HostsMap = std::map<std::string, scoped_refptr<DevToolsAgentHost>>;
-  using RawHostsMap = std::map<std::string, DevToolsAgentHost*>;
+  using Hosts = base::flat_set<scoped_refptr<DevToolsAgentHost>>;
 
-  void UpdateServiceWorkers(bool waiting_for_debugger);
-  void ReattachTargetsOfType(const HostsMap& new_hosts,
+  void ReattachServiceWorkers(bool waiting_for_debugger);
+  void ReattachTargetsOfType(const Hosts& new_hosts,
                              const std::string& type,
                              bool waiting_for_debugger);
-  void TargetCreatedInternal(DevToolsAgentHost* host);
-  void TargetInfoChangedInternal(DevToolsAgentHost* host);
-  void TargetDestroyedInternal(DevToolsAgentHost* host);
-  bool AttachToTargetInternal(DevToolsAgentHost* host,
-                              bool waiting_for_debugger);
-  void DetachFromTargetInternal(DevToolsAgentHost* host);
 
   // ServiceWorkerDevToolsManager::Observer implementation.
   void WorkerCreated(ServiceWorkerDevToolsAgentHost* host) override;
@@ -91,33 +48,21 @@ class TargetHandler : public DevToolsDomainHandler,
   void WorkerVersionDoomed(ServiceWorkerDevToolsAgentHost* host) override;
   void WorkerDestroyed(ServiceWorkerDevToolsAgentHost* host) override;
 
-  // DevToolsAgentHostObserver implementation.
-  bool ShouldForceDevToolsAgentHostCreation() override;
-  void DevToolsAgentHostCreated(DevToolsAgentHost* agent_host) override;
-  void DevToolsAgentHostDestroyed(DevToolsAgentHost* agent_host) override;
-  void DevToolsAgentHostAttached(DevToolsAgentHost* agent_host) override;
-  void DevToolsAgentHostDetached(DevToolsAgentHost* agent_host) override;
-
-  // DevToolsAgentHostClient implementation.
-  void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
-                               const std::string& message) override;
-  void AgentHostClosed(DevToolsAgentHost* agent_host,
-                       bool replaced_with_another_client) override;
-
-  std::unique_ptr<Target::Frontend> frontend_;
-  bool discover_;
+  AttachCallback attach_callback_;
+  DetachCallback detach_callback_;
+  RenderFrameHostImpl* render_frame_host_;
+  base::flat_set<GURL> frame_urls_;
+
   bool auto_attach_;
   bool wait_for_debugger_on_start_;
   bool attach_to_frames_;
-  RenderFrameHostImpl* render_frame_host_;
-  HostsMap attached_hosts_;
-  std::set<GURL> frame_urls_;
-  RawHostsMap reported_hosts_;
 
-  DISALLOW_COPY_AND_ASSIGN(TargetHandler);
+  Hosts auto_attached_hosts_;
+
+  DISALLOW_COPY_AND_ASSIGN(TargetAutoAttacher);
 };
 
 }  // namespace protocol
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_HANDLER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_AUTO_ATTACHER_H_