[DevTools] Move Network domain overrides to NetworkHandler

BUG=405566

Review URL: https://codereview.chromium.org/633413002

Cr-Commit-Position: refs/heads/master@{#299298}

content/browser/devtools/protocol/network_handler.cc

@@ -4,28 +4,38 @@
 
 #include "content/browser/devtools/protocol/network_handler.h"
 
+#include "content/public/browser/content_browser_client.h"
+#include "content/public/common/content_client.h"
+
 namespace content {
 namespace devtools {
 namespace network {
 
 typedef DevToolsProtocolClient::Response Response;
 
-NetworkHandler::NetworkHandler() {
+NetworkHandler::NetworkHandler() : host_(nullptr) {
 }
 
 NetworkHandler::~NetworkHandler() {
 }
 
+void NetworkHandler::SetRenderViewHost(RenderViewHost* host) {
+  host_ = host;
+}
+
 Response NetworkHandler::ClearBrowserCache() {
-  return Response::FallThrough();
+  GetContentClient()->browser()->ClearCache(host_);
+  return Response::OK();
 }
 
 Response NetworkHandler::ClearBrowserCookies() {
-  return Response::FallThrough();
+  GetContentClient()->browser()->ClearCookies(host_);
+  return Response::OK();
 }
 
 Response NetworkHandler::CanEmulateNetworkConditions(bool* result) {
-  return Response::FallThrough();
+  *result = false;
+  return Response::OK();
 }
 
 Response NetworkHandler::EmulateNetworkConditions(bool offline,

content/browser/devtools/protocol/network_handler.h

@@ -8,6 +8,9 @@
 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
 
 namespace content {
+
+class RenderViewHost;
+
 namespace devtools {
 namespace network {
 
@@ -18,6 +21,8 @@ class NetworkHandler {
   NetworkHandler();
   virtual ~NetworkHandler();
 
+  void SetRenderViewHost(RenderViewHost* host);
+
   Response ClearBrowserCache();
   Response ClearBrowserCookies();
   Response CanEmulateNetworkConditions(bool* result);
@@ -28,6 +33,8 @@ class NetworkHandler {
                                     double upload_throughput);
 
  private:
+  RenderViewHost* host_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
 };
 

content/browser/devtools/render_view_devtools_agent_host.cc

@@ -111,6 +111,7 @@ RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
     : render_view_host_(NULL),
       dom_handler_(new devtools::dom::DOMHandler()),
       input_handler_(new devtools::input::InputHandler()),
+      network_handler_(new devtools::network::NetworkHandler()),
       page_handler_(new devtools::page::PageHandler()),
       power_handler_(new devtools::power::PowerHandler()),
       handler_impl_(new DevToolsProtocolHandlerImpl()),
@@ -120,6 +121,7 @@ RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
       reattaching_(false) {
   handler_impl_->SetDOMHandler(dom_handler_.get());
   handler_impl_->SetInputHandler(input_handler_.get());
+  handler_impl_->SetNetworkHandler(network_handler_.get());
   handler_impl_->SetPageHandler(page_handler_.get());
   handler_impl_->SetPowerHandler(power_handler_.get());
   SetRenderViewHost(rvh);
@@ -377,6 +379,7 @@ void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {
   overrides_handler_->SetRenderViewHost(render_view_host_);
   dom_handler_->SetRenderViewHost(render_view_host_);
   input_handler_->SetRenderViewHost(render_view_host_);
+  network_handler_->SetRenderViewHost(render_view_host_);
   page_handler_->SetRenderViewHost(render_view_host_);
 
   registrar_.Add(
@@ -395,6 +398,7 @@ void RenderViewDevToolsAgentHost::ClearRenderViewHost() {
   overrides_handler_->ClearRenderViewHost();
   dom_handler_->SetRenderViewHost(nullptr);
   input_handler_->SetRenderViewHost(nullptr);
+  network_handler_->SetRenderViewHost(nullptr);
   page_handler_->SetRenderViewHost(nullptr);
 }
 

content/browser/devtools/render_view_devtools_agent_host.h

@@ -13,6 +13,7 @@
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
 #include "content/browser/devtools/protocol/dom_handler.h"
 #include "content/browser/devtools/protocol/input_handler.h"
+#include "content/browser/devtools/protocol/network_handler.h"
 #include "content/browser/devtools/protocol/page_handler.h"
 #include "content/browser/devtools/protocol/power_handler.h"
 #include "content/common/content_export.h"
@@ -113,6 +114,7 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
   RenderViewHostImpl* render_view_host_;
   scoped_ptr<devtools::dom::DOMHandler> dom_handler_;
   scoped_ptr<devtools::input::InputHandler> input_handler_;
+  scoped_ptr<devtools::network::NetworkHandler> network_handler_;
   scoped_ptr<devtools::page::PageHandler> page_handler_;
   scoped_ptr<devtools::power::PowerHandler> power_handler_;
   scoped_ptr<DevToolsProtocolHandlerImpl> handler_impl_;

content/browser/devtools/renderer_overrides_handler.cc

@@ -64,21 +64,6 @@ namespace content {
 
 RendererOverridesHandler::RendererOverridesHandler()
     : weak_factory_(this) {
-  RegisterCommandHandler(
-      devtools::Network::canEmulateNetworkConditions::kName,
-      base::Bind(
-          &RendererOverridesHandler::CanEmulateNetworkConditions,
-          base::Unretained(this)));
-  RegisterCommandHandler(
-      devtools::Network::clearBrowserCache::kName,
-      base::Bind(
-          &RendererOverridesHandler::ClearBrowserCache,
-          base::Unretained(this)));
-  RegisterCommandHandler(
-      devtools::Network::clearBrowserCookies::kName,
-      base::Bind(
-          &RendererOverridesHandler::ClearBrowserCookies,
-          base::Unretained(this)));
   RegisterCommandHandler(
       devtools::Page::queryUsageAndQuota::kName,
       base::Bind(
@@ -100,31 +85,6 @@ void RendererOverridesHandler::ClearRenderViewHost() {
   host_ = NULL;
 }
 
-// Network agent handlers  ----------------------------------------------------
-
-scoped_refptr<DevToolsProtocol::Response>
-RendererOverridesHandler::CanEmulateNetworkConditions(
-    scoped_refptr<DevToolsProtocol::Command> command) {
-  base::DictionaryValue* result = new base::DictionaryValue();
-  result->SetBoolean(devtools::kResult, false);
-  return command->SuccessResponse(result);
-}
-
-scoped_refptr<DevToolsProtocol::Response>
-RendererOverridesHandler::ClearBrowserCache(
-    scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCache(host_);
-  return command->SuccessResponse(NULL);
-}
-
-scoped_refptr<DevToolsProtocol::Response>
-RendererOverridesHandler::ClearBrowserCookies(
-    scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCookies(host_);
-  return command->SuccessResponse(NULL);
-}
-
-
 // Quota and Usage ------------------------------------------
 
 namespace {

content/browser/devtools/renderer_overrides_handler.h

@@ -46,14 +46,6 @@ class CONTENT_EXPORT RendererOverridesHandler
   void ClearRenderViewHost();
 
  private:
-  // Network domain.
-  scoped_refptr<DevToolsProtocol::Response> CanEmulateNetworkConditions(
-      scoped_refptr<DevToolsProtocol::Command> command);
-  scoped_refptr<DevToolsProtocol::Response> ClearBrowserCache(
-      scoped_refptr<DevToolsProtocol::Command> command);
-  scoped_refptr<DevToolsProtocol::Response> ClearBrowserCookies(
-      scoped_refptr<DevToolsProtocol::Command> command);
-
   // Page domain.
   scoped_refptr<DevToolsProtocol::Response> PageQueryUsageAndQuota(
       scoped_refptr<DevToolsProtocol::Command>);