DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

content/browser/devtools/renderer_overrides_handler.cc

Index: content/browser/devtools/renderer_overrides_handler.cc
diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc
index 9d61ce81af107558903a14755eea6cc71d14deda..868541b88dc867fd606defa0187724f4fc75d1d4 100644
--- a/content/browser/devtools/renderer_overrides_handler.cc
+++ b/content/browser/devtools/renderer_overrides_handler.cc
@@ -151,8 +151,7 @@ RendererOverridesHandler::RendererOverridesHandler(DevToolsAgentHost* agent)
 RendererOverridesHandler::~RendererOverridesHandler() {}
 
 void RendererOverridesHandler::OnClientDetached() {
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   if (screencast_command_ && host)
     host->SetTouchEventEmulationEnabled(false, false);
   screencast_command_ = NULL;
@@ -174,8 +173,7 @@ void RendererOverridesHandler::OnVisibilityChanged(bool visible) {
 }
 
 void RendererOverridesHandler::OnRenderViewHostChanged() {
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   if (screencast_command_ && host)
     host->SetTouchEventEmulationEnabled(true, true);
 }
@@ -190,7 +188,7 @@ void RendererOverridesHandler::InnerSwapCompositorFrame() {
     return;
   }
 
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (!host->GetView())
     return;
 
@@ -272,7 +270,7 @@ RendererOverridesHandler::GrantPermissionsForSetFileInputFiles(
       devtools::DOM::setFileInputFiles::kParamFiles;
   if (!params || !params->GetList(param, &file_list))
     return command->InvalidParamResponse(param);
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (!host)
     return NULL;
 
@@ -292,14 +290,14 @@ RendererOverridesHandler::GrantPermissionsForSetFileInputFiles(
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::ClearBrowserCache(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCache(agent_->GetRenderViewHost());
+  GetContentClient()->browser()->ClearCache(GetRenderViewHostImpl());
   return command->SuccessResponse(NULL);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::ClearBrowserCookies(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  GetContentClient()->browser()->ClearCookies(agent_->GetRenderViewHost());
+  GetContentClient()->browser()->ClearCookies(GetRenderViewHostImpl());
   return command->SuccessResponse(NULL);
 }
 
@@ -309,8 +307,7 @@ RendererOverridesHandler::ClearBrowserCookies(
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageDisable(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   if (screencast_command_ && host)
     host->SetTouchEventEmulationEnabled(false, false);
   screencast_command_ = NULL;
@@ -334,7 +331,7 @@ RendererOverridesHandler::PageHandleJavaScriptDialog(
     prompt_override_ptr = NULL;
   }
 
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (host) {
     WebContents* web_contents = host->GetDelegate()->GetAsWebContents();
     if (web_contents) {
@@ -361,7 +358,7 @@ RendererOverridesHandler::PageNavigate(
   if (!gurl.is_valid()) {
     return command->InternalErrorResponse("Cannot navigate to invalid URL");
   }
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (host) {
     WebContents* web_contents = host->GetDelegate()->GetAsWebContents();
     if (web_contents) {
@@ -377,7 +374,7 @@ RendererOverridesHandler::PageNavigate(
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageReload(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (host) {
     WebContents* web_contents = host->GetDelegate()->GetAsWebContents();
     if (web_contents) {
@@ -395,7 +392,7 @@ RendererOverridesHandler::PageReload(
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageGetNavigationHistory(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (host) {
     WebContents* web_contents = host->GetDelegate()->GetAsWebContents();
     if (web_contents) {
@@ -438,7 +435,7 @@ RendererOverridesHandler::PageNavigateToHistoryEntry(
     return command->InvalidParamResponse(param);
   }
 
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
   if (host) {
     WebContents* web_contents = host->GetDelegate()->GetAsWebContents();
     if (web_contents) {
@@ -458,8 +455,7 @@ RendererOverridesHandler::PageNavigateToHistoryEntry(
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageCaptureScreenshot(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   if (!host->GetView())
     return command->InternalErrorResponse("Unable to access the view");
 
@@ -507,8 +503,7 @@ scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageStartScreencast(
     scoped_refptr<DevToolsProtocol::Command> command) {
   screencast_command_ = command;
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   host->SetTouchEventEmulationEnabled(true, true);
   bool visible = !host->is_hidden();
   NotifyScreencastVisibility(visible);
@@ -526,8 +521,7 @@ RendererOverridesHandler::PageStopScreencast(
     scoped_refptr<DevToolsProtocol::Command> command) {
   last_frame_time_ = base::TimeTicks();
   screencast_command_ = NULL;
-  RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>(
-      agent_->GetRenderViewHost());
+  RenderViewHostImpl* host = GetRenderViewHostImpl();
   if (host)
     host->SetTouchEventEmulationEnabled(false, false);
   return command->SuccessResponse(NULL);
@@ -820,9 +814,10 @@ RendererOverridesHandler::PageQueryUsageAndQuota(
       weak_factory_.GetWeakPtr(),
       command);
 
-  scoped_refptr<quota::QuotaManager> quota_manager =
-      agent_->GetRenderViewHost()->GetProcess()->
-          GetStoragePartition()->GetQuotaManager();
+  scoped_refptr<quota::QuotaManager> quota_manager = GetRenderViewHostImpl()
+                                                         ->GetProcess()
+                                                         ->GetStoragePartition()
+                                                         ->GetQuotaManager();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -863,7 +858,7 @@ RendererOverridesHandler::InputEmulateTouchFromMouseEvent(
   if (!params)
     return command->NoSuchMethodErrorResponse();
 
-  RenderViewHost* host = agent_->GetRenderViewHost();
+  RenderViewHost* host = GetRenderViewHostImpl();
 
   std::string type;
   if (!params->GetString(
@@ -981,4 +976,9 @@ RendererOverridesHandler::InputEmulateTouchFromMouseEvent(
   return command->SuccessResponse(NULL);
 }
 
+RenderViewHostImpl* RendererOverridesHandler::GetRenderViewHostImpl() {
+  return static_cast<RenderViewHostImpl*>(
+      agent_->GetWebContents()->GetRenderViewHost());
+}
+
 }  // namespace content