Revert 98552 (OpenAndManuallyCloseDevToolsClientHost now fails on

content/browser/debugger/devtools_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
 #define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
-#include "content/browser/debugger/devtools_agent_host.h"
 #include "content/browser/debugger/devtools_client_host.h"
+#include "content/common/notification_observer.h"
+#include "content/common/notification_registrar.h"
 
 namespace IPC {
 class Message;
 }
 
-class DevToolsAgentHost;
 class DevToolsNetLogObserver;
 class GURL;
 class IOThread;
 class PrefService;
 class RenderViewHost;
 class TabContents;
 
 typedef std::map<std::string, std::string> DevToolsRuntimeProperties;
 
 // This class is a singleton that manages DevToolsClientHost instances and
 // routes messages between developer tools clients and agents.
-//
-// Methods below that accept inspected RenderViewHost as a parameter are
-// just convenience methods that call corresponding methods accepting
-// DevToolAgentHost.
 class DevToolsManager : public DevToolsClientHost::CloseListener,
-                        public DevToolsAgentHost::CloseListener {
+                        public NotificationObserver {
  public:
   static DevToolsManager* GetInstance();
 
   DevToolsManager();
   virtual ~DevToolsManager();
 
   // Returns DevToolsClientHost registered for |inspected_rvh| or NULL if
   // there is no alive DevToolsClientHost registered for |inspected_rvh|.
   DevToolsClientHost* GetDevToolsClientHostFor(RenderViewHost* inspected_rvh);
 
@@ skipping 29 matching lines @@
   // AttachClientHost.
   int DetachClientHost(RenderViewHost* from_rvh);
 
   // Attaches orphan client host to new render view host.
   void AttachClientHost(int client_host_cookie,
                         RenderViewHost* to_rvh);
 
   // Closes all open developer tools windows.
   void CloseAllClientHosts();
 
-  DevToolsClientHost* GetDevToolsClientHostFor(DevToolsAgentHost* agent_host);
-  void UnregisterDevToolsClientHostFor(DevToolsAgentHost* agent_host);
-
  private:
   // DevToolsClientHost::CloseListener override.
   // This method will remove all references from the manager to the
   // DevToolsClientHost and unregister all listeners related to the
   // DevToolsClientHost.
   virtual void ClientHostClosing(DevToolsClientHost* host);
 
-  // DevToolsAgentHost::CloseListener implementation.
-  virtual void AgentHostClosing(DevToolsAgentHost* host);
+  // Overridden from NotificationObserver:
+  virtual void Observe(int type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
 
-  // Returns DevToolsAgentHost inspected by the DevToolsClientHost.
-  DevToolsAgentHost* GetAgentHost(DevToolsClientHost* client_host);
+  // Returns RenderViewHost for the tab that is inspected by devtools
+  // client hosted by DevToolsClientHost.
+  RenderViewHost* GetInspectedRenderViewHost(DevToolsClientHost* client_host);
 
-  void SendAttachToAgent(DevToolsAgentHost*);
-  void SendDetachToAgent(DevToolsAgentHost*);
+  void SendAttachToAgent(RenderViewHost* inspected_rvh);
+  void SendDetachToAgent(RenderViewHost* inspected_rvh);
 
-  void BindClientHost(DevToolsAgentHost* agent_host,
+  void BindClientHost(RenderViewHost* inspected_rvh,
                       DevToolsClientHost* client_host,
                       const DevToolsRuntimeProperties& runtime_properties);
-  void UnbindClientHost(DevToolsAgentHost* agent_host,
+
+  void UnbindClientHost(RenderViewHost* inspected_rvh,
                         DevToolsClientHost* client_host);
 
   // These two maps are for tracking dependencies between inspected tabs and
   // their DevToolsClientHosts. They are useful for routing devtools messages
   // and allow us to have at most one devtools client host per tab.
   //
   // DevToolsManager start listening to DevToolsClientHosts when they are put
   // into these maps and removes them when they are closing.
-  typedef std::map<DevToolsAgentHost*, DevToolsClientHost*>
-      AgentToClientHostMap;
-  AgentToClientHostMap agent_to_client_host_;
+  typedef std::map<RenderViewHost*, DevToolsClientHost*>
+      InspectedRvhToClientHostMap;
+  InspectedRvhToClientHostMap inspected_rvh_to_client_host_;
 
-  typedef std::map<DevToolsClientHost*, DevToolsAgentHost*>
+  typedef std::map<DevToolsClientHost*, RenderViewHost*>
       ClientHostToInspectedRvhMap;
-  ClientHostToInspectedRvhMap client_to_agent_host_;
+  ClientHostToInspectedRvhMap client_host_to_inspected_rvh_;
 
-  typedef std::map<DevToolsAgentHost*, DevToolsRuntimeProperties>
+  typedef std::map<RenderViewHost*, DevToolsRuntimeProperties>
       RuntimePropertiesMap;
   RuntimePropertiesMap runtime_properties_map_;
 
   typedef std::map<int,
                    std::pair<DevToolsClientHost*, DevToolsRuntimeProperties> >
       OrphanClientHosts;
   OrphanClientHosts orphan_client_hosts_;
   int last_orphan_cookie_;
 
+  NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(DevToolsManager);
 };
 
 #endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_