Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

content/browser/webui/web_ui_controller_factory_registry.cc

Index: content/browser/webui/web_ui_controller_factory_registry.cc
===================================================================
--- content/browser/webui/web_ui_controller_factory_registry.cc	(revision 179251)
+++ content/browser/webui/web_ui_controller_factory_registry.cc	(working copy)
@@ -17,11 +17,7 @@
   g_factories.Pointer()->push_back(factory);
 }
 
-WebUIControllerFactoryRegistry* WebUIControllerFactoryRegistry::GetInstance() {
-  return Singleton<WebUIControllerFactoryRegistry>::get();
-}
-
-void WebUIControllerFactoryRegistry::UnregisterFactoryForTesting(
+void WebUIControllerFactory::UnregisterFactoryForTesting(
     WebUIControllerFactory* factory) {
   std::vector<WebUIControllerFactory*>* factories = g_factories.Pointer();
   for (size_t i = 0; i < factories->size(); ++i) {
@@ -33,6 +29,10 @@
   NOTREACHED() << "Tried to unregister a factory but it wasn't found";
 }
 
+WebUIControllerFactoryRegistry* WebUIControllerFactoryRegistry::GetInstance() {
+  return Singleton<WebUIControllerFactoryRegistry>::get();
+}
+
 WebUIController* WebUIControllerFactoryRegistry::CreateWebUIControllerForURL(
     WebUI* web_ui, const GURL& url) const {
   std::vector<WebUIControllerFactory*>* factories = g_factories.Pointer();