Rename WebUIFactory to WebUIControllerFactory since that's what it creates now.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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 "chrome/browser/ui/webui/chrome_web_ui_factory.h"
+#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/policy_ui.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "chrome/browser/ui/webui/profiler_ui.h"
 #include "chrome/browser/ui/webui/quota_internals_ui.h"
 #include "chrome/browser/ui/webui/sessions_ui.h"
 #include "chrome/browser/ui/webui/sync_internals_ui.h"
-#include "chrome/browser/ui/webui/test_chrome_web_ui_factory.h"
+#include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 #include "chrome/browser/ui/webui/workers_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
@@ skipping 298 matching lines @@
   static Type* New() {
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
       return DefaultSingletonTraits<TestType>::New();
     else
       return DefaultSingletonTraits<Type>::New();
   }
 };
 
 }  // namespace
 
-WebUI::TypeID ChromeWebUIFactory::GetWebUIType(
+WebUI::TypeID ChromeWebUIControllerFactory::GetWebUIType(
       content::BrowserContext* browser_context, const GURL& url) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, profile, url);
   return function ? reinterpret_cast<WebUI::TypeID>(function) : WebUI::kNoWebUI;
 }
 
-bool ChromeWebUIFactory::UseWebUIForURL(
+bool ChromeWebUIControllerFactory::UseWebUIForURL(
     content::BrowserContext* browser_context, const GURL& url) const {
   return GetWebUIType(browser_context, url) != WebUI::kNoWebUI;
 }
 
-bool ChromeWebUIFactory::UseWebUIBindingsForURL(
+bool ChromeWebUIControllerFactory::UseWebUIBindingsForURL(
     content::BrowserContext* browser_context, const GURL& url) const {
   // Extensions are rendered via WebUI in tabs, but don't actually need WebUI
   // bindings (see the ExtensionWebUI constructor).
   return !NeedsExtensionWebUI(NULL,
                               Profile::FromBrowserContext(browser_context),
                               url) &&
       UseWebUIForURL(browser_context, url);
 }
 
-bool ChromeWebUIFactory::HasWebUIScheme(const GURL& url) const {
+bool ChromeWebUIControllerFactory::HasWebUIScheme(const GURL& url) const {
   return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          url.SchemeIs(chrome::kChromeInternalScheme) ||
          url.SchemeIs(chrome::kChromeUIScheme);
 }
 
-bool ChromeWebUIFactory::IsURLAcceptableForWebUI(
+bool ChromeWebUIControllerFactory::IsURLAcceptableForWebUI(
     content::BrowserContext* browser_context,
     const GURL& url) const {
   return UseWebUIForURL(browser_context, url) ||
       // javacsript: URLs are allowed to run in Web UI pages
       url.SchemeIs(chrome::kJavaScriptScheme) ||
       // It's possible to load about:blank in a Web UI renderer.
       // See http://crbug.com/42547
       url.spec() == chrome::kAboutBlankURL ||
       // Chrome URLs crash, kill, hang, and shorthang are allowed.
       url == GURL(chrome::kChromeUICrashURL) ||
       url == GURL(chrome::kChromeUIKillURL) ||
       url == GURL(chrome::kChromeUIHangURL) ||
       url == GURL(chrome::kChromeUIShorthangURL);
 }
 
-WebUIController* ChromeWebUIFactory::CreateWebUIForURL(
+WebUIController* ChromeWebUIControllerFactory::CreateWebUIControllerForURL(
     content::WebUI* web_ui,
     const GURL& url) const {
   Profile* profile = Profile::FromWebUI(web_ui);
   WebUIFactoryFunction function = GetWebUIFactoryFunction(web_ui,
                                                           profile, url);
   if (!function)
     return NULL;
 
   return (*function)(web_ui, url);
 }
 
-void ChromeWebUIFactory::GetFaviconForURL(
+void ChromeWebUIControllerFactory::GetFaviconForURL(
     Profile* profile,
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url) const {
   // All extensions but the bookmark manager get their favicon from the icons
   // part of the manifest.
   if (page_url.SchemeIs(chrome::kExtensionScheme) &&
       page_url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, page_url);
   } else {
     history::FaviconData favicon;
     favicon.image_data = scoped_refptr<RefCountedMemory>(
         GetFaviconResourceBytes(page_url));
     favicon.known_icon = favicon.image_data.get() != NULL &&
                              favicon.image_data->size() > 0;
     favicon.icon_type = history::FAVICON;
     request->ForwardResultAsync(request->handle(), favicon);
   }
 }
 
 // static
-ChromeWebUIFactory* ChromeWebUIFactory::GetInstance() {
-  return Singleton< ChromeWebUIFactory, PossibleTestSingletonTraits<
-      ChromeWebUIFactory, TestChromeWebUIFactory> >::get();
+ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
+  return Singleton< ChromeWebUIControllerFactory, PossibleTestSingletonTraits<
+      ChromeWebUIControllerFactory, TestChromeWebUIControllerFactory> >::get();
 }
 
-ChromeWebUIFactory::ChromeWebUIFactory() {
+ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() {
 }
 
-ChromeWebUIFactory::~ChromeWebUIFactory() {
+ChromeWebUIControllerFactory::~ChromeWebUIControllerFactory() {
 }
 
-RefCountedMemory* ChromeWebUIFactory::GetFaviconResourceBytes(
+RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
     const GURL& page_url) const {
   // The bookmark manager is a chrome extension, so we have to check for it
   // before we check for extension scheme.
   if (page_url.host() == extension_misc::kBookmarkManagerId)
     return BookmarksUI::GetFaviconResourceBytes();
 
   // The extension scheme is handled in GetFaviconForURL.
   if (page_url.SchemeIs(chrome::kExtensionScheme)) {
     NOTREACHED();
     return NULL;
@@ skipping 29 matching lines @@
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsFrameHost)
     return options2::OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
   return NULL;
 }