Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

chrome/test/base/web_ui_browsertest.h

 // 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.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_
-#define CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_
+#ifndef CHROME_TEST_BASE_WEB_UI_BROWSERTEST_H_
+#define CHROME_TEST_BASE_WEB_UI_BROWSERTEST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/js_injection_ready_observer.h"
 
 namespace base {
 class Value;
 }
 
 namespace content {
 class RenderViewHost;
 class WebUI;
 class WebUIMessageHandler;
 }
 
+class TestChromeWebUIControllerFactory;
 class WebUITestHandler;
 
 // This macro simplifies the declaration of simple javascript unit tests.
 // Use:
 //   WEB_UI_UNITTEST_F(MyWebUIPageTest, myJavascriptUnittest);
 #define WEB_UI_UNITTEST_F(x, y) \
   IN_PROC_BROWSER_TEST_F(x, y) { \
     ASSERT_TRUE(RunJavascriptTest(#y)); \
   }
 
@@ skipping 84 matching lines @@
   WebUIBrowserTest();
 
   // Accessors for preload test fixture and name.
   void set_preload_test_fixture(const std::string& preload_test_fixture);
   void set_preload_test_name(const std::string& preload_test_name);
 
   // Set up & tear down console error catching.
   virtual void SetUpOnMainThread() OVERRIDE;
   virtual void CleanUpOnMainThread() OVERRIDE;
 
-  // Set up test path & override for |kDummyURL|.
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-
-  // Tear down override for |kDummyURL|.
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
-
   // Set a WebUI instance to run tests on.
   void SetWebUIInstance(content::WebUI* web_ui);
 
   // Returns a mock WebUI object under test (if any).
   virtual content::WebUIMessageHandler* GetMockMessageHandler();
 
   // Returns a file:// GURL constructed from |path| inside the test data dir for
   // webui tests.
   static GURL WebUITestDataPathToURL(const FilePath::StringType& path);
 
@@ skipping 44 matching lines @@
   bool libraries_preloaded_;
 
   // Saves the states of |test_fixture| and |test_name| for calling
   // PreloadJavascriptLibraries().
   std::string preload_test_fixture_;
   std::string preload_test_name_;
 
   // When this is non-NULL, this is The WebUI instance used for testing.
   // Otherwise the selected tab's web_ui is used.
   content::WebUI* override_selected_web_ui_;
+
+  scoped_ptr<TestChromeWebUIControllerFactory> test_factory_;
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_
+#endif  // CHROME_TEST_BASE_WEB_UI_BROWSERTEST_H_