[DevTools] Move DevToolsClientHost functionality out of DevToolsFrontendHost.

content/shell/browser/shell_devtools_frontend.h

Index: content/shell/browser/shell_devtools_frontend.h
diff --git a/content/shell/browser/shell_devtools_frontend.h b/content/shell/browser/shell_devtools_frontend.h
index f08aa242b21fc631ab339480e7a50ae401a8d3ac..ea8391e98678eaa4828c4aed4b67492a0e8da8ec 100644
--- a/content/shell/browser/shell_devtools_frontend.h
+++ b/content/shell/browser/shell_devtools_frontend.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_client_host.h"
-#include "content/public/browser/devtools_frontend_host_delegate.h"
+#include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace content {
@@ -24,7 +24,8 @@ class Shell;
 class WebContents;
 
 class ShellDevToolsFrontend : public WebContentsObserver,
-                              public DevToolsFrontendHostDelegate {
+                              public DevToolsFrontendHost::Delegate,
+                              public DevToolsClientHost {
  public:
   static ShellDevToolsFrontend* Show(WebContents* inspected_contents);
   static ShellDevToolsFrontend* Show(WebContents* inspected_contents,
@@ -42,19 +43,25 @@ class ShellDevToolsFrontend : public WebContentsObserver,
   virtual ~ShellDevToolsFrontend();
 
   // WebContentsObserver overrides
-  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
 
-  // DevToolsFrontendHostDelegate implementation
-  virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE {}
+  // content::DevToolsFrontendHost::Delegate implementation.
+  virtual bool ShouldSetupDevToolsFrontendForUrl(const GURL& url) OVERRIDE;
+  virtual void HandleMessageFromDevToolsFrontend(
+      const std::string& message) OVERRIDE {}
+  virtual void HandleMessageFromDevToolsFrontendToBackend(
+      const std::string& message) OVERRIDE;
 
+  // content::DevToolsClientHost implementation.
+  virtual void DispatchOnInspectorFrontend(const std::string& message) OVERRIDE;
   virtual void InspectedContentsClosing() OVERRIDE;
+  virtual void ReplacedWithAnotherClient() OVERRIDE {}
 
   Shell* frontend_shell_;
   scoped_refptr<DevToolsAgentHost> agent_host_;
-  scoped_ptr<DevToolsClientHost> frontend_host_;
+  scoped_ptr<DevToolsFrontendHost> frontend_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDevToolsFrontend);
 };