Remove WebContents::GetRoutingID().

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 879 matching lines @@
 }
 
 void WebContentsImpl::SendPageMessage(IPC::Message* msg) {
   frame_tree_.root()->render_manager()->SendPageMessage(msg, nullptr);
 }
 
 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,
                                    false,   // suppress_callbacks,
                                    false);  // reset_state
   }
   if (browser_plugin_embedder_)
     browser_plugin_embedder_->CancelGuestDialogs();
 }
 
@@ skipping 2159 matching lines @@
 
 int WebContentsImpl::GetMinimumZoomPercent() const {
   return minimum_zoom_percent_;
 }
 
 int WebContentsImpl::GetMaximumZoomPercent() const {
   return maximum_zoom_percent_;
 }
 
 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 {
   return capturer_count_ == 0 ? preferred_size_ : preferred_size_for_capture_;
 }
 
 bool WebContentsImpl::GotResponseToLockMouseRequest(bool allowed) {
   if (GetBrowserPluginGuest())
     return GetBrowserPluginGuest()->LockMouse(allowed);
 
@@ skipping 498 matching lines @@
 void WebContentsImpl::OnPageScaleFactorChanged(float page_scale_factor) {
   bool is_one = page_scale_factor == 1.f;
   if (is_one != page_scale_factor_is_one_) {
     page_scale_factor_is_one_ = is_one;
 
     HostZoomMapImpl* host_zoom_map =
         static_cast<HostZoomMapImpl*>(HostZoomMap::GetForWebContents(this));
 
     if (host_zoom_map && GetRenderProcessHost()) {
       host_zoom_map->SetPageScaleFactorIsOneForView(
-          GetRenderProcessHost()->GetID(), GetRoutingID(),
+          GetRenderProcessHost()->GetID(), GetRenderViewHost()->GetRoutingID(),
           page_scale_factor_is_one_);
     }
   }
 
   for (auto& observer : observers_)
     observer.OnPageScaleFactorChanged(page_scale_factor);
 }
 
 void WebContentsImpl::OnEnumerateDirectory(int request_id,
                                            const base::FilePath& path) {
@@ skipping 1665 matching lines @@
   dialog_manager_ = dialog_manager;
 }
 
 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
   auto it = binding_sets_.find(interface_name);
   if (it != binding_sets_.end())
     binding_sets_.erase(it);
 }
 
 }  // namespace content