Remove WebContents::GetRoutingID().

content/browser/loader/resource_dispatcher_host_unittest.cc

Index: content/browser/loader/resource_dispatcher_host_unittest.cc
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 8dfae97d5e54ab6ba82dc27c46538fdafe87f82c..80c63a23500089c6e0042ac8e211e25c9eb39008 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -1197,8 +1197,8 @@ void ResourceDispatcherHostTest::
   ResourceRequest request = CreateResourceRequest("GET", type, url);
   request.origin_pid = web_contents_->GetRenderProcessHost()->GetID();
   request.render_frame_id = web_contents_->GetMainFrame()->GetRoutingID();
-  ResourceHostMsg_RequestResource msg(web_contents_->GetRoutingID(), request_id,
-                                      request);
+  ResourceHostMsg_RequestResource msg(
+      web_contents_->GetRenderViewHost()->GetRoutingID(), request_id, request);

[mmenke, 2016/11/28 18:53:25]

Need to include RenderViewHost header, and update deps, if needed.

[davidsac (gone - try alexmos), 2016/11/28 19:12:42]

Done.

   host_.OnMessageReceived(msg, web_contents_filter_.get());
   KickOffRequest();
 }
@@ -1235,7 +1235,7 @@ void ResourceDispatcherHostTest::MakeWebContentsAssociatedDownloadRequest(
       std::move(request), Referrer(), browser_context_->GetResourceContext(),
       false,  // is_content_initiated
       web_contents_->GetRenderProcessHost()->GetID(),
-      web_contents_->GetRoutingID(),
+      web_contents_->GetRenderViewHost()->GetRoutingID(),
       web_contents_->GetMainFrame()->GetRoutingID(), false);
 }
 
@@ -2766,7 +2766,8 @@ TEST_P(ResourceDispatcherHostTest, CancelRequestsForContextTransferred) {
   EXPECT_EQ(1, host_.pending_requests());
 
   // Cancelling by other methods shouldn't work either.
-  host_.CancelRequestsForProcess(web_contents_->GetRoutingID());
+  host_.CancelRequestsForProcess(
+      web_contents_->GetRenderViewHost()->GetRoutingID());
   EXPECT_EQ(1, host_.pending_requests());
 
   // Cancelling by context should work.