Adds testing infrastructure to web_ui_browsertest to support testing HtmlDialogs.

chrome/browser/ui/webui/web_ui_browsertest.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_
 #define CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_
 #pragma once
 
 #include <string>
 
@@ skipping 58 matching lines @@
   bool RunJavascriptTest(const std::string& test_name);
   bool RunJavascriptTest(const std::string& test_name,
                          base::Value* arg);
   bool RunJavascriptTest(const std::string& test_name,
                          base::Value* arg1,
                          base::Value* arg2);
   bool RunJavascriptTest(const std::string& test_name,
                          const ConstValueVector& test_arguments);
 
   // Runs a test that may include calls to functions in test_api.js, and waits
-  // for call to asyncTestDone().  Takes ownership of Value arguments.
+  // for call to testDone().  Takes ownership of Value arguments.
   bool RunJavascriptAsyncTest(const std::string& test_name);
   bool RunJavascriptAsyncTest(const std::string& test_name,
                               base::Value* arg);
   bool RunJavascriptAsyncTest(const std::string& test_name,
                               base::Value* arg1,
                               base::Value* arg2);
   bool RunJavascriptAsyncTest(const std::string& test_name,
                               base::Value* arg1,
                               base::Value* arg2,
                               base::Value* arg3);
@@ skipping 28 matching lines @@
   static const char kDummyURL[];
 
   WebUIBrowserTest();
 
   // 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.
+  virtual void SetWebUIInstance(WebUI* web_ui);

[Sheridan Rawlins, 2011/09/15 19:11:41]

Do we need virtual here?

[flackr, 2011/09/15 21:02:37]

Unlikely. Done.

+
   // Returns a mock WebUI object under test (if any).
   virtual WebUIMessageHandler* GetMockMessageHandler();
 
   // Returns a file:// GURL constructed from |path| inside the test data dir for
   // webui tests.
   static GURL WebUITestDataPathToURL(const FilePath::StringType& path);
 
  private:
   // TestNavigationObserver::JsInjectionReadyObserver implementation.
   virtual void OnJsInjectionReady(RenderViewHost* render_view_host) OVERRIDE;
@@ skipping 33 matching lines @@
   std::vector<FilePath> user_libraries_;
 
   // Indicates that the libraries have been pre-loaded and to not load them
   // again.
   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_;
+
+  // The WebUI instance used for testing.
+  WebUI* web_ui_instance_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_