Added options browser_tests using the generator and js handler framework.

chrome/browser/ui/webui/web_ui_browsertest.cc

 // 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.
 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
 
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
+#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/webui/test_chrome_web_ui_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/test_navigation_observer.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 const FilePath::CharType kWebUILibraryJS[] = FILE_PATH_LITERAL("test_api.js");
 const FilePath::CharType kWebUITestFolder[] = FILE_PATH_LITERAL("webui");
 base::LazyInstance<std::vector<std::string> > error_messages_(
@@ skipping 70 matching lines @@
 void WebUIBrowserTest::PreLoadJavascriptLibraries(bool override_chrome_send) {
   ASSERT_FALSE(libraries_preloaded_);
   scoped_ptr<Value> override_chrome_send_arg(
       Value::CreateBooleanValue(override_chrome_send));
   RunJavascriptFunction("preloadJavascriptLibraries",
                         *override_chrome_send_arg);
   libraries_preloaded_ = true;
 }
 
 WebUIBrowserTest::WebUIBrowserTest()
-    : test_handler_(new WebUITestHandler()),
+    : override_chrome_send_(false),
+      test_handler_(new WebUITestHandler()),
       libraries_preloaded_(false),
       skip_test_(false) {}
 
+void WebUIBrowserTest::BrowsePreload(const GURL& browse_to,
+                                     bool override_chrome_send) {
+  override_chrome_send_ = override_chrome_send;
+  TestNavigationObserver navigation_observer(
+      browser()->GetSelectedTabContentsWrapper(), this);
+  browser::NavigateParams params(
+      browser(), GURL(browse_to), PageTransition::TYPED);
+  params.disposition = CURRENT_TAB;
+  browser::Navigate(&params);
+  navigation_observer.WaitForObservation();
+}
+
 void WebUIBrowserTest::SetUpInProcessBrowserTestFixture() {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_));
   test_data_directory_ = test_data_directory_.Append(kWebUITestFolder);
 
   // TODO(dtseng): should this be part of every BrowserTest or just WebUI test.
   FilePath resources_pack_path;
   PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
   ResourceBundle::AddDataPackToSharedInstance(resources_pack_path);
 
   AddLibrary(FilePath(kWebUILibraryJS));
@@ skipping 11 matching lines @@
 GURL WebUIBrowserTest::WebUITestDataPathToURL(
     const FilePath::StringType& path) {
   FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data));
   FilePath test_path(dir_test_data.AppendASCII("webui"));
   test_path = test_path.Append(path);
   EXPECT_TRUE(file_util::PathExists(test_path));
   return net::FilePathToFileURL(test_path);
 }
 
+// TestTabStripModelObserver::LoadStartObserver:
+void  WebUIBrowserTest::OnLoadStart() OVERRIDE {
+  PreLoadJavascriptLibraries(override_chrome_send_);

[James Hawkins, 2011/07/08 00:03:33]

When is this ever false?

[Sheridan Rawlins, 2011/07/08 22:45:49]

It wasn't and with the TEST_F-style of generation/invocation, this morphed into
preload_test_fixture_ & preload_test_name_).

On 2011/07/08 00:03:33, James Hawkins wrote:

+}
+
 void WebUIBrowserTest::BuildJavascriptLibraries(std::string* content) {
   ASSERT_TRUE(content != NULL);
-  std::string library_content, src_content;
+  std::string library_content;
+
+#if defined(OS_MACOSX)

[James Hawkins, 2011/07/08 00:03:33]

Document this section.

[Sheridan Rawlins, 2011/07/08 22:45:49]

With GEN() method for generation, the test files output pure c++ ifdefs and this
is not needed.

On 2011/07/08 00:03:33, James Hawkins wrote:

+  content->append("var OS_MACOSX = 1;");
+#endif
+#if defined(OS_CHROMEOS)
+  content->append("var OS_CHROMEOS = 1;");
+#endif
+#if defined(OS_WIN)
+  content->append("var OS_WIN = 1;");
+#endif
+#if defined(TOUCH_UI)
+  content->append("var TOUCH_UI = 1;");
+#endif
 
   std::vector<FilePath>::iterator user_libraries_iterator;
   for (user_libraries_iterator = user_libraries_.begin();
        user_libraries_iterator != user_libraries_.end();
        ++user_libraries_iterator) {
     if (user_libraries_iterator->IsAbsolute()) {
       ASSERT_TRUE(file_util::ReadFileToString(*user_libraries_iterator,
                                               &library_content));
     } else {
       ASSERT_TRUE(file_util::ReadFileToString(
@@ skipping 161 matching lines @@
 
   static const char kChromeTestBrowserTestPass[];
 };
 
 const char WebUIBrowserTestPass::kChromeTestBrowserTestPass[] =
     "chrome://WebUIBrowserTestPass";
 
 #include "chrome/test/data/webui/sample_pass-inl.h"
 
 #endif  // !defined(ARCH_CPU_ARM_FAMILY)