Remove WebContents::GetRoutingID().

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b22bfdaa29fea8982f715fce1d99644b77d2ee72..6650e923514f8562f88467d510d8e1e9e4dff24c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -897,13 +897,6 @@ RenderViewHostImpl* WebContentsImpl::GetRenderViewHost() const {
   return GetRenderManager()->current_host();
 }
 
-int WebContentsImpl::GetRoutingID() const {
-  if (!GetRenderViewHost())
-    return MSG_ROUTING_NONE;

[Charlie Reis, 2016/11/23 07:53:35]

Technically there's a small risk we could see some crashes in the new code if
anyone hit this case in practice, but I don't think that's likely.

-
-  return GetRenderViewHost()->GetRoutingID();
-}
-
 void WebContentsImpl::CancelActiveAndPendingDialogs() {
   if (dialog_manager_) {
     dialog_manager_->CancelDialogs(this,
@@ -3083,7 +3076,8 @@ int WebContentsImpl::GetMaximumZoomPercent() const {
 }
 
 void WebContentsImpl::SetPageScale(float page_scale_factor) {
-  Send(new ViewMsg_SetPageScale(GetRoutingID(), page_scale_factor));
+  Send(new ViewMsg_SetPageScale(GetRenderViewHost()->GetRoutingID(),
+                                page_scale_factor));
 }
 
 gfx::Size WebContentsImpl::GetPreferredSize() const {
@@ -3602,7 +3596,7 @@ void WebContentsImpl::OnPageScaleFactorChanged(float page_scale_factor) {
 
     if (host_zoom_map && GetRenderProcessHost()) {
       host_zoom_map->SetPageScaleFactorIsOneForView(
-          GetRenderProcessHost()->GetID(), GetRoutingID(),
+          GetRenderProcessHost()->GetID(), GetRenderViewHost()->GetRoutingID(),
           page_scale_factor_is_one_);
     }
   }