Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.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/test_chrome_web_ui_controller_factory.h"
+#include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::WebContents;
 using content::WebUI;
 using content::WebUIController;
@@ skipping 20 matching lines @@
 // Dummy URL location for us to override.
 const char kChromeTestChromeWebUIControllerFactory[] =
     "chrome://ChromeTestChromeWebUIControllerFactory/";
 
 // Sets up and tears down the factory override for our url's host. It is
 // necessary to do this here, rather than in the test declaration, which is too
 // late to catch the possibility of an initial browse to about:blank mistakenly
 // going to this handler.
 class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
  public:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
-    TestChromeWebUIControllerFactory::AddFactoryOverride(
+  virtual void SetUpOnMainThread() OVERRIDE {
+    content::WebUIControllerFactory::UnregisterFactoryForTesting(
+        ChromeWebUIControllerFactory::GetInstance());
+    test_factory_.reset(new TestChromeWebUIControllerFactory);
+    content::WebUIControllerFactory::RegisterFactory(test_factory_.get());
+    test_factory_->AddFactoryOverride(
         GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_);
   }
 
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
-    TestChromeWebUIControllerFactory::RemoveFactoryOverride(
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    test_factory_->RemoveFactoryOverride(
         GURL(kChromeTestChromeWebUIControllerFactory).host());
+    content::WebUIControllerFactory::UnregisterFactoryForTesting(
+        test_factory_.get());
+
+    test_factory_.reset();
   }
 
  protected:
   StrictMock<MockWebUIProvider> mock_provider_;
+  scoped_ptr<TestChromeWebUIControllerFactory> test_factory_;
 };
 
 }  // namespace
 
 // Test that browsing to our test url causes us to be called once.
 IN_PROC_BROWSER_TEST_F(TestChromeWebUIControllerFactoryTest,
                        TestWebUIProvider) {
   const GURL kChromeTestChromeWebUIControllerFactoryURL(
       kChromeTestChromeWebUIControllerFactory);
   EXPECT_CALL(mock_provider_,
               NewWebUI(_, Eq(kChromeTestChromeWebUIControllerFactoryURL)))
       .WillOnce(ReturnNewWebUI());
   ui_test_utils::NavigateToURL(browser(),
                                kChromeTestChromeWebUIControllerFactoryURL);
 }