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 c1579fa9121c587b77a0f4c27252a1fb2cf84d62..fe1029d967f2bf8188da4d0cde015aa6d8bc0f07 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -856,13 +856,15 @@ WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url,
 }
 
 WebUI* WebContentsImpl::GetWebUI() const {

[carlosk, 2015/10/30 18:55:44]

I kept the implementation of GetWebUI() working the same as it was before and it
matches the description in the public WebContents API. But IMO its name is very
misleading.

-  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();
+  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) {
@@ -929,9 +931,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();
   if (our_web_ui) {
     // Don't override the title in view source mode.
     entry = controller_.GetVisibleEntry();