Revert 79691 - Move WebUIFactory to chrome/browser.

content/browser/tab_contents/render_view_host_manager.cc

Index: content/browser/tab_contents/render_view_host_manager.cc
===================================================================
--- content/browser/tab_contents/render_view_host_manager.cc	(revision 79692)
+++ content/browser/tab_contents/render_view_host_manager.cc	(working copy)
@@ -21,7 +21,6 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/browser/webui/web_ui_factory.h"
-#include "content/common/content_client.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 #include "content/common/view_messages.h"
@@ -302,14 +301,13 @@
   const GURL& current_url = (cur_entry) ? cur_entry->url() :
       render_view_host_->site_instance()->site();
   Profile* profile = delegate_->GetControllerForRenderManager().profile();
-  const content::WebUIFactory* web_ui_factory = content::WebUIFactory::Get();
-  if (web_ui_factory->UseWebUIForURL(profile, current_url)) {
+  if (WebUIFactory::UseWebUIForURL(profile, current_url)) {
     // Force swap if it's not an acceptable URL for Web UI.
-    if (!web_ui_factory->IsURLAcceptableForWebUI(profile, new_entry->url()))
+    if (!WebUIFactory::IsURLAcceptableForWebUI(profile, new_entry->url()))
       return true;
   } else {
     // Force swap if it's a Web UI URL.
-    if (web_ui_factory->UseWebUIForURL(profile, new_entry->url()))
+    if (WebUIFactory::UseWebUIForURL(profile, new_entry->url()))
       return true;
   }
 
@@ -386,9 +384,8 @@
     // want to use the curr_instance if it has no site, since it will have a
     // RenderProcessHost of TYPE_NORMAL.  Create a new SiteInstance for this
     // URL instead (with the correct process type).
-    if (content::WebUIFactory::Get()->UseWebUIForURL(profile, dest_url)) {
+    if (WebUIFactory::UseWebUIForURL(profile, dest_url))
       return SiteInstance::CreateSiteInstanceForURL(profile, dest_url);
-    }
 
     // Normally the "site" on the SiteInstance is set lazily when the load
     // actually commits. This is to support better process sharing in case