Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

chrome/test/base/test_chrome_web_ui_controller_factory.cc

 // Copyright (c) 2011 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/test_chrome_web_ui_controller_factory.h"
+#include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
 using content::WebUI;
 using content::WebUIController;
 
 TestChromeWebUIControllerFactory::WebUIProvider::~WebUIProvider() {
 }
 
 TestChromeWebUIControllerFactory::TestChromeWebUIControllerFactory() {
 }
 
 TestChromeWebUIControllerFactory::~TestChromeWebUIControllerFactory() {
 }
 
 void TestChromeWebUIControllerFactory::AddFactoryOverride(
     const std::string& host, WebUIProvider* provider) {
-  DCHECK_EQ(0U, GetInstance()->factory_overrides_.count(host));
-  GetInstance()->factory_overrides_[host] = provider;
+  DCHECK_EQ(0U, factory_overrides_.count(host));
+  factory_overrides_[host] = provider;
 }
 
 void TestChromeWebUIControllerFactory::RemoveFactoryOverride(
     const std::string& host) {
-  DCHECK_EQ(1U, GetInstance()->factory_overrides_.count(host));
-  GetInstance()->factory_overrides_.erase(host);
+  DCHECK_EQ(1U, factory_overrides_.count(host));
+  factory_overrides_.erase(host);
 }
 
 WebUI::TypeID TestChromeWebUIControllerFactory::GetWebUIType(
     content::BrowserContext* browser_context, const GURL& url) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   WebUIProvider* provider = GetWebUIProvider(profile, url);
   return provider ? reinterpret_cast<WebUI::TypeID>(provider) :
       ChromeWebUIControllerFactory::GetWebUIType(profile, url);
 }
 
 WebUIController* TestChromeWebUIControllerFactory::CreateWebUIControllerForURL(
     content::WebUI* web_ui, const GURL& url) const {
   Profile* profile = Profile::FromWebUI(web_ui);
   WebUIProvider* provider = GetWebUIProvider(profile, url);
   return provider ? provider->NewWebUI(web_ui, url) :
       ChromeWebUIControllerFactory::CreateWebUIControllerForURL(web_ui, url);
 }
 
-TestChromeWebUIControllerFactory*
-    TestChromeWebUIControllerFactory::GetInstance() {
-  return static_cast<TestChromeWebUIControllerFactory*>(
-      ChromeWebUIControllerFactory::GetInstance());
-}
-
 TestChromeWebUIControllerFactory::WebUIProvider*
     TestChromeWebUIControllerFactory::GetWebUIProvider(
         Profile* profile, const GURL& url) const {
   FactoryOverridesMap::const_iterator found =
       factory_overrides_.find(url.host());
   return (found == factory_overrides_.end()) ? NULL : found->second;
 }