Revert of Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost.

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 1ff29b6475e5ac368830b2d87d770c6ef9be1872..a845ca4038316cb51e7060a7bcbbf34032470af1 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -17,7 +17,6 @@
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/site_instance_impl.h"
-#include "content/browser/webui/web_ui_impl.h"
 #include "content/common/accessibility_mode_enums.h"
 #include "content/common/ax_content_node_data.h"
 #include "content/common/content_export.h"
@@ -219,12 +218,6 @@
   RenderFrameHostDelegate* delegate() { return delegate_; }
   FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
 
-  // Returns the associated WebUI or null if none applies.
-  WebUIImpl* web_ui() const { return web_ui_.get(); }
-
-  // Returns the associated WebUI type.
-  WebUI::TypeID web_ui_type() const { return web_ui_type_; }
-
   // Returns this RenderFrameHost's loading state. This method is only used by
   // FrameTreeNode. The proper way to check whether a frame is loading is to
   // call FrameTreeNode::IsLoading.
@@ -479,15 +472,6 @@
   // is the parent chain of the focused frame within the frame tree. In
   // addition, its associated RenderWidgetHost has to be focused.
   bool IsFocused();
-
-  // Updates the WebUI of this RenderFrameHost based on the provided |dest_url|,
-  // setting it to either none, a new instance or simply reuses the currently
-  // existing one. Returns true if a WebUI change occurred.
-  // If this is a history navigation its NavigationEntry bindings should be
-  // provided through |entry_bindings| to allow verifying that they are not
-  // being set differently this time around. Otherwise |entry_bindings| should
-  // be set to NavigationEntryImpl::kInvalidBindings so that no checks are done.
-  bool UpdateWebUI(const GURL& dest_url, int entry_bindings);
 
   // Returns the Mojo ImageDownloader service.
   const image_downloader::ImageDownloaderPtr& GetMojoImageDownloader();
@@ -658,9 +642,6 @@
   FrameTreeNode* FindAndVerifyChild(
       int32 child_frame_routing_id, bad_message::BadMessageReason reason);
 
-  // Resets all WebUI related fields.
-  void ResetWebUI();
-
   // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
   // refcount that calls Shutdown when it reaches zero.  This allows each
   // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
@@ -829,12 +810,6 @@
   // NavigationHandle for it is owned by the NavigationRequest.
   scoped_ptr<NavigationHandleImpl> navigation_handle_;
 
-  // The associated WebUIImpl and its type. They will be set if the current
-  // document or the one being navigated to is from WebUI source. Otherwise they
-  // will be null and WebUI::kNoWebUI, respectively.
-  scoped_ptr<WebUIImpl> web_ui_;
-  WebUI::TypeID web_ui_type_;
-
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;