Allow WebUI Tests to use preLoad in HtmlDialogUI.

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>
 
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/test_navigation_observer.h"
+#include "chrome/test/base/js_injection_ready_observer.h"
+#include "chrome/test/base/test_navigation_observer.h"
 
 class RenderViewHost;
 class WebUIMessageHandler;
 
 namespace base {
 class Value;
 }
 
 // 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)); \
   }
 
 // The runner of WebUI javascript based tests.
 // See chrome/test/data/webui/test_api.js for the javascript side test API's.
 //
 // These tests should follow the form given in:
 // chrome/test/data/webui/sample_downloads.js.
 // and the lone test within this class.
 class WebUIBrowserTest
     : public InProcessBrowserTest,
-      public TestNavigationObserver::JsInjectionReadyObserver {
+      public JsInjectionReadyObserver {
  public:
   typedef std::vector<const base::Value*> ConstValueVector;
   virtual ~WebUIBrowserTest();
 
   // Add a custom helper JS library for your test.
   // If a relative path is specified, it'll be read
   // as relative to the test data dir.
   void AddLibrary(const FilePath& library_path);
 
   // Runs a javascript function in the context of all libraries.
@@ skipping 43 matching lines @@
   // sets the |libraries_preloaded| flag to prevent re-loading at next
   // javascript invocation.
   void PreLoadJavascriptLibraries(const std::string& preload_test_fixture,
                                   const std::string& preload_test_name,
                                   RenderViewHost* preload_host);
 
   // Called by javascript-generated test bodies to browse to a page and preload
   // the javascript for the given |preload_test_fixture| and
   // |preload_test_name|. chrome.send will be overridden to allow javascript
   // handler mocking.
-  void BrowsePreload(const GURL& browse_to,
-                     const std::string& preload_test_fixture,
-                     const std::string& preload_test_name);
+  void BrowsePreload(const GURL& browse_to);
 
   // Called by javascript-generated test bodies to browse to a page and preload
   // the javascript for the given |preload_test_fixture| and
   // |preload_test_name|. chrome.send will be overridden to allow javascript
   // handler mocking.
-  void BrowsePrintPreload(const GURL& browse_to,
-                          const std::string& preload_test_fixture,
-                          const std::string& preload_test_name);
+  void BrowsePrintPreload(const GURL& browse_to);
 
  protected:
   // URL to dummy WebUI page for testing framework.
   static const char kDummyURL[];
 
   WebUIBrowserTest();
 
+  // Accessors for preload test fixture and name.
+  void set_preload_test_fixture(const std::string& preload_test_fixture) {
+    preload_test_fixture_ = preload_test_fixture;

[James Hawkins, 2011/11/22 23:03:29]

Move the implementation the .cc file.

[Sheridan Rawlins, 2011/11/23 20:10:07]

Done.

+  }
+  void set_preload_test_name(const std::string& preload_test_name) {
+    preload_test_name_ = 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(WebUI* web_ui);
 
   // 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.
+  // JsInjectionReadyObserver implementation.
   virtual void OnJsInjectionReady(RenderViewHost* render_view_host) OVERRIDE;
 
   // Builds a string containing all added javascript libraries.
   void BuildJavascriptLibraries(string16* content);
 
   // Builds a string with a call to the runTest JS function, passing the
   // given |is_async|, |test_name| and its |args|.
   string16 BuildRunTestJSCall(bool is_async,
                               const std::string& test_name,
                               const WebUIBrowserTest::ConstValueVector& args);
@@ skipping 34 matching lines @@
   // 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.
   WebUI* override_selected_web_ui_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_WEB_UI_BROWSERTEST_H_