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

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 df01715770b3a8be12ca00afa3de663374fc9620..6b3630c343d67b2181ed137773e4a9dee06cbe14 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -840,13 +840,15 @@ WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url,
 }
 
 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) {
@@ -913,9 +915,9 @@ const base::string16& WebContentsImpl::GetTitle() const {
   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();