Remove RFHM::GetNavigatingWebUI() and RFHM::web_ui().

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 <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 822 matching lines @@
   GetMainFrame()->RequestAXTreeSnapshot(callback);
 }
 
 WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url,
                                             const std::string& frame_name) {
   DCHECK(!frame_name.empty());
   return CreateWebUI(url, frame_name);
 }
 
 WebUI* WebContentsImpl::GetWebUI() const {
-  return GetRenderManager()->web_ui()
-             ? GetRenderManager()->web_ui()
-             : GetRenderManager()->GetNavigatingWebUI();
+  if (GetCommittedWebUI())
+    return GetCommittedWebUI();
+  if (GetRenderManager()->pending_frame_host())
+    return GetRenderManager()->pending_frame_host()->web_ui();

[nasko, 2015/11/04 17:23:26]

This version won't work with PlzNavigate, would it?

[carlosk, 2015/11/04 21:50:38]

Indeed and nice catch! Fixed.

+  return nullptr;
 }
 
 WebUI* WebContentsImpl::GetCommittedWebUI() const {
-  return GetRenderManager()->web_ui();
+  return frame_tree_.root()->current_frame_host()->web_ui();
 }
 
 void WebContentsImpl::SetUserAgentOverride(const std::string& override) {
   if (GetUserAgentOverride() == override)
     return;
 
   renderer_preferences_.user_agent_override = override;
 
   // Send the new override string to the renderer.
   RenderViewHost* host = GetRenderViewHost();
@@ skipping 46 matching lines @@
 const base::string16& WebContentsImpl::GetTitle() const {
   // Transient entries take precedence. They are used for interstitial pages
   // that are shown on top of existing pages.
   NavigationEntry* entry = controller_.GetTransientEntry();
   std::string accept_languages =
       GetContentClient()->browser()->GetAcceptLangs(
           GetBrowserContext());
   if (entry) {
     return entry->GetTitleForDisplay(accept_languages);
   }
-  WebUI* our_web_ui = GetRenderManager()->GetNavigatingWebUI()
-                          ? GetRenderManager()->GetNavigatingWebUI()
-                          : GetRenderManager()->web_ui();
+  WebUI* our_web_ui = GetRenderManager()->pending_frame_host()
+                          ? GetRenderManager()->pending_frame_host()->web_ui()
+                          : frame_tree_.root()->current_frame_host()->web_ui();

[nasko, 2015/11/04 17:23:26]

Seems inconsistent to use GetRenderManager() for two of the three calls here.
Let's be consistent.

[carlosk, 2015/11/04 21:50:38]

And it didn't support PlzNavigate neither. All fixed now.

(in fact I tried using GetMainFrame before but that one can't be used here
because it's not const)

   if (our_web_ui) {
     // Don't override the title in view source mode.
     entry = controller_.GetVisibleEntry();
     if (!(entry && entry->IsViewSourceMode())) {
       // Give the Web UI the chance to override our title.
       const base::string16& title = our_web_ui->GetOverriddenTitle();
       if (!title.empty())
         return title;
     }
   }
@@ skipping 3716 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content