[DevTools] Rework DevToolsSession interaction with domain handlers.

content/browser/devtools/devtools_agent_host_impl.h

Index: content/browser/devtools/devtools_agent_host_impl.h
diff --git a/content/browser/devtools/devtools_agent_host_impl.h b/content/browser/devtools/devtools_agent_host_impl.h
index 75541d14b2d6d34795f98e29ad83f519da1630d3..519d6a7e0eca23ed8c28627c9426014560e25408 100644
--- a/content/browser/devtools/devtools_agent_host_impl.h
+++ b/content/browser/devtools/devtools_agent_host_impl.h
@@ -23,12 +23,6 @@ class DevToolsSession;
 // Describes interface for managing devtools agents from the browser process.
 class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
  public:
-  // Informs the hosted agent that a client host has attached.
-  virtual void Attach() = 0;
-
-  // Informs the hosted agent that a client host has detached.
-  virtual void Detach() = 0;
-
   // DevToolsAgentHost implementation.
   bool AttachClient(DevToolsAgentHostClient* client) override;
   void ForceAttachClient(DevToolsAgentHostClient* client) override;
@@ -57,13 +51,18 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
 
   static bool ShouldForceCreation();
 
-  virtual bool DispatchProtocolMessage(const std::string& message) = 0;
-  virtual void InspectElement(int x, int y);
+  virtual void Attach(DevToolsSession* session) = 0;
+  virtual void Detach(DevToolsSession* session) = 0;
+  virtual bool DispatchProtocolMessage(
+      DevToolsSession* session,
+      const std::string& message) = 0;
+  virtual void InspectElement(DevToolsSession* session, int x, int y);
 
   void NotifyCreated();
   void HostClosed();
   DevToolsIOContext* GetIOContext() { return &io_context_; }
 
+  // TODO(dgozman): remove this accessor.
   DevToolsSession* session() { return session_.get(); }
 
  private:
@@ -75,10 +74,8 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
   void NotifyDestroyed();
 
   const std::string id_;
-  int session_id_;
   int last_session_id_;
   std::unique_ptr<DevToolsSession> session_;
-  DevToolsAgentHostClient* client_;
   DevToolsIOContext io_context_;
   static int s_attached_count_;
   static int s_force_creation_count_;