[DevTools] Move network protocol handler to RenderFrameHost.

BUG=470453

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

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

android_webview/browser/aw_content_browser_client.cc

@@ -30,6 +30,7 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -501,12 +502,12 @@ bool AwContentBrowserClient::IsFastShutdownPossible() {
   return false;
 }
 
-void AwContentBrowserClient::ClearCache(content::RenderViewHost* rvh) {
-  RemoveHttpDiskCache(rvh->GetProcess()->GetBrowserContext(),
-                      rvh->GetProcess()->GetID());
+void AwContentBrowserClient::ClearCache(content::RenderFrameHost* rfh) {
+  RemoveHttpDiskCache(rfh->GetProcess()->GetBrowserContext(),
+                      rfh->GetProcess()->GetID());
 }
 
-void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) {
+void AwContentBrowserClient::ClearCookies(content::RenderFrameHost* rfh) {
   // TODO(boliu): Implement.
   NOTIMPLEMENTED();
 }

android_webview/browser/aw_content_browser_client.h

@@ -134,8 +134,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
   net::NetLog* GetNetLog() override;
   content::AccessTokenStore* CreateAccessTokenStore() override;
   bool IsFastShutdownPossible() override;
-  void ClearCache(content::RenderViewHost* rvh) override;
-  void ClearCookies(content::RenderViewHost* rvh) override;
+  void ClearCache(content::RenderFrameHost* rfh) override;
+  void ClearCookies(content::RenderFrameHost* rfh) override;
   base::FilePath GetDefaultDownloadDirectory() override;
   std::string GetDefaultDownloadName() override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;

chrome/browser/chrome_content_browser_client.cc

@@ -2244,9 +2244,9 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
   handler->AddHandlerPair(&HandleWebUI, &HandleWebUIReverse);
 }
 
-void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) {
+void ChromeContentBrowserClient::ClearCache(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
-      rvh->GetSiteInstance()->GetProcess()->GetBrowserContext());
+      rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemover::CreateForUnboundedRange(profile);
   remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
@@ -2254,9 +2254,9 @@ void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) {
   // BrowsingDataRemover takes care of deleting itself when done.
 }
 
-void ChromeContentBrowserClient::ClearCookies(RenderViewHost* rvh) {
+void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
-      rvh->GetSiteInstance()->GetProcess()->GetBrowserContext());
+      rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemover::CreateForUnboundedRange(profile);
   int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;

chrome/browser/chrome_content_browser_client.h

@@ -225,8 +225,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   void OverrideWebkitPrefs(content::RenderViewHost* rvh,
                            content::WebPreferences* prefs) override;
   void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override;
-  void ClearCache(content::RenderViewHost* rvh) override;
-  void ClearCookies(content::RenderViewHost* rvh) override;
+  void ClearCache(content::RenderFrameHost* rfh) override;
+  void ClearCookies(content::RenderFrameHost* rfh) override;
   base::FilePath GetDefaultDownloadDirectory() override;
   std::string GetDefaultDownloadName() override;
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;

content/browser/devtools/protocol/network_handler.cc

@@ -19,7 +19,7 @@ NetworkHandler::NetworkHandler() : host_(nullptr) {
 NetworkHandler::~NetworkHandler() {
 }
 
-void NetworkHandler::SetRenderViewHost(RenderViewHost* host) {
+void NetworkHandler::SetRenderFrameHost(RenderFrameHost* host) {
   host_ = host;
 }
 

content/browser/devtools/protocol/network_handler.h

@@ -9,7 +9,7 @@
 
 namespace content {
 
-class RenderViewHost;
+class RenderFrameHost;
 
 namespace devtools {
 namespace network {
@@ -21,7 +21,7 @@ class NetworkHandler {
   NetworkHandler();
   virtual ~NetworkHandler();
 
-  void SetRenderViewHost(RenderViewHost* host);
+  void SetRenderFrameHost(RenderFrameHost* host);
 
   Response ClearBrowserCache();
   Response ClearBrowserCookies();
@@ -33,7 +33,7 @@ class NetworkHandler {
                                     double upload_throughput);
 
  private:
-  RenderViewHost* host_;
+  RenderFrameHost* host_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
 };

content/browser/devtools/render_frame_devtools_agent_host.cc

@@ -420,7 +420,7 @@ void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {
   dom_handler_->SetRenderViewHost(rvh);
   emulation_handler_->SetRenderViewHost(rvh);
   input_handler_->SetRenderViewHost(rvh);
-  network_handler_->SetRenderViewHost(rvh);
+  network_handler_->SetRenderFrameHost(render_frame_host_);
   page_handler_->SetRenderViewHost(rvh);
   service_worker_handler_->SetRenderFrameHost(render_frame_host_);
 
@@ -442,7 +442,7 @@ void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() {
   dom_handler_->SetRenderViewHost(nullptr);
   emulation_handler_->SetRenderViewHost(nullptr);
   input_handler_->SetRenderViewHost(nullptr);
-  network_handler_->SetRenderViewHost(nullptr);
+  network_handler_->SetRenderFrameHost(nullptr);
   page_handler_->SetRenderViewHost(nullptr);
   service_worker_handler_->SetRenderFrameHost(nullptr);
 }

content/public/browser/content_browser_client.h

@@ -505,10 +505,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual void BrowserURLHandlerCreated(BrowserURLHandler* handler) {}
 
   // Clears browser cache.
-  virtual void ClearCache(RenderViewHost* rvh) {}
+  virtual void ClearCache(RenderFrameHost* rfh) {}
 
   // Clears browser cookies.
-  virtual void ClearCookies(RenderViewHost* rvh) {}
+  virtual void ClearCookies(RenderFrameHost* rfh) {}
 
   // Returns the default download directory.
   // This can be called on any thread.