Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/base/js2gtest.js

 // 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.
 
 /**
  * @fileoverview Generator script for creating gtest-style JavaScript
  *     tests for WebUI and unit tests. Generates C++ gtest wrappers
  *     which will invoke the appropriate JavaScript for each test.
  * @author scr@chromium.org (Sheridan Rawlins)
  * @see WebUI testing: http://goo.gl/ZWFXF
@@ skipping 48 matching lines @@
  */
 var typedeffedCppFixtures = {};
 
 /**
  * Maintains a list of relative file paths to add to each gtest body
  * for inclusion at runtime before running each JavaScript test.
  * @type {Array.<string>}
  */
 var genIncludes = [];
 
+/**
+ * When true, add calls to set_preload_test_(fixture|name).

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

Document the rationale.

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

Done.

+ * @type {boolean}
+ */
+var addSetPreloadInfo;
+
 // Generate the file to stdout.
 print('// GENERATED FILE');
 print('// ' + arguments.join(' '));
 print('// PLEASE DO NOT HAND EDIT!');
 print();
 
 // Output some C++ headers based upon the |testType|.
 //
 // Currently supports:
 // 'unit' - unit_tests harness, js2unit rule, V8UnitTest superclass.
 // 'webui' - browser_tests harness, js2webui rule, WebUIBrowserTest superclass.
 if (testType === 'unit') {
   print('#include "chrome/test/base/v8_unit_test.h"');
   testing.Test.prototype.typedefCppFixture = 'V8UnitTest';
   testF = 'TEST_F';
+  addSetPreloadInfo = false;
 } else {
   print('#include "chrome/browser/ui/webui/web_ui_browsertest.h"');
   testing.Test.prototype.typedefCppFixture = 'WebUIBrowserTest';
   testF = 'IN_PROC_BROWSER_TEST_F';
+  addSetPreloadInfo = true;
 }
 print('#include "googleurl/src/gurl.h"');
 print('#include "testing/gtest/include/gtest/gtest.h"');
 print();
 
 /**
  * Convert the |includeFile| to paths appropriate for immediate
  * inclusion (path) and runtime inclusion (base).
  * @param {string} includeFile The file to include.
  * @return {{path: string, base: string}} Object describing the paths
@@ skipping 51 matching lines @@
           function(includeFile) {
             return includeFileToPaths(includeFile).base;
           }));
 
   if (typedefCppFixture && !(testFixture in typedeffedCppFixtures)) {
     print('typedef ' + typedefCppFixture + ' ' + testFixture + ';');
     typedeffedCppFixtures[testFixture] = typedefCppFixture;
   }
 
   print(testF + '(' + testFixture + ', ' + testFunction + ') {');
-  if (testGenPreamble)
-    testGenPreamble(testFixture, testFunction);
   for (var i = 0; i < extraLibraries.length; i++) {
     print('  AddLibrary(FilePath(FILE_PATH_LITERAL("' +
         extraLibraries[i].replace(/\\/g, '/') + '")));');
   }
   print('  AddLibrary(FilePath(FILE_PATH_LITERAL("' +
       jsFileBase.replace(/\\/g, '/') + '")));');
-  if (browsePreload) {
-    print('  BrowsePreload(GURL("' + browsePreload + '"), "' + testFixture +
-          '", "' + testFunction + '");');
-    }
+  if (addSetPreloadInfo) {
+    print('  set_preload_test_fixture("' + testFixture + '");');
+    print('  set_preload_test_name("' + testFunction + '");');
+  }
+  if (testGenPreamble)
+    testGenPreamble(testFixture, testFunction);
+  if (browsePreload)
+    print('  BrowsePreload(GURL("' + browsePreload + '"));');
   if (browsePrintPreload) {
     print('  BrowsePrintPreload(GURL(WebUITestDataPathToURL(\n' +
-          '      FILE_PATH_LITERAL("' + browsePrintPreload + '"))),\n' +
-          '      "' + testFixture + '", "' + testFunction + '");');
+          '      FILE_PATH_LITERAL("' + browsePrintPreload + '"))));');
   }
   print('  ' + testPredicate + '(RunJavascriptTestF(' + isAsyncParam +
         '"' + testFixture + '", ' +
         '"' + testFunction + '"));');
   if (testGenPostamble)
     testGenPostamble(testFixture, testFunction);
   print('}');
   print();
 }
 
 // Now that generation functions are defined, load in |jsFile|.
 var js = read(jsFile);
 eval(js);