Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

content/browser/webui/web_ui_controller_factory_registry.cc

 // Copyright (c) 2013 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 "content/browser/webui/web_ui_controller_factory_registry.h"
 
 #include "base/lazy_instance.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 
 base::LazyInstance<std::vector<WebUIControllerFactory*> > g_factories =
     LAZY_INSTANCE_INITIALIZER;
 
 void WebUIControllerFactory::RegisterFactory(WebUIControllerFactory* factory) {
   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) {
     if ((*factories)[i] == factory) {
       factories->erase(factories->begin() + i);
       return;
     }
   }
   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();
   for (size_t i = 0; i < factories->size(); ++i) {
     WebUIController* controller = (*factories)[i]->CreateWebUIControllerForURL(
         web_ui, url);
     if (controller)
       return controller;
   }
   return NULL;
@@ skipping 51 matching lines @@
       (data_urls_allowed && url.SchemeIs(chrome::kDataScheme));
 }
 
 WebUIControllerFactoryRegistry::WebUIControllerFactoryRegistry() {
 }
 
 WebUIControllerFactoryRegistry::~WebUIControllerFactoryRegistry() {
 }
 
 }  // namespace content