WebUI test framework: fix Mock4JS verification, allow chrome.send passthrough.

chrome/chrome_tests.gypi

 # 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.
 {
   'variables' : {
     # Variables for js2gtest rules
     'gypv8sh': '../tools/gypv8sh.py',
     'js2gtest': 'test/base/js2gtest.js',
-    'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest',
     'mock_js': 'third_party/mock4js/mock4js.js',
     'test_api_js': 'test/data/webui/test_api.js',
 
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
       'common/pref_names.h',
       'test/automation/browser_proxy.cc',
@@ skipping 1984 matching lines @@
           'extension': 'gtestjs',
           'msvs_external_rule': 1,
           'inputs': [
             '<(gypv8sh)',
             '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
             '<(mock_js)',
             '<(test_api_js)',
             '<(js2gtest)',
           ],
           'outputs': [
-            '<(js2gtest_out_dir)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc',
+            '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',

[Ryan Sleevi, 2011/11/11 18:48:40]

Just a minor nit - when using <(INTERMEDIATE_DIR), each intermediate is unique
per target, so you don't need to prefix with /chrome/. It's fine w/ or w/o
though.

[Sheridan Rawlins, 2011/11/11 19:07:46]

I like the similarity to the location under src/ and I'll keep the /chrome/,
though it's not required.  Thanks for the leeway to choose.

On 2011/11/11 18:48:40, Ryan Sleevi wrote:

             '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
           ],
           'process_outputs_as_sources': 1,
           'action': [
             'python',
             '<@(_inputs)',
             'unit',
             '<(RULE_INPUT_PATH)',
             'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
             '<@(_outputs)',
@@ skipping 636 matching lines @@
         'test/automation/dom_automation_browsertest.cc',
         'test/base/in_process_browser_test_browsertest.cc',
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/chrome_test_launcher.cc',
         'test/data/webui/assertions.js',
         'test/data/webui/async_gen-inl.h',
         'test/data/webui/async_gen.js',
         'test/data/webui/certificate_viewer_dialog_test.js',
         'test/data/webui/certificate_viewer_ui_test-inl.h',
+        'test/data/webui/chrome_send_browsertest.cc',
+        'test/data/webui/chrome_send_browsertest.h',
+        'test/data/webui/chrome_send_browsertest.js',
+        'test/data/webui/mock4js_browsertest.js',
         'test/data/webui/ntp4.js',
         'test/data/webui/print_preview.js',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',
         '../content/app/startup_helper_win.cc',
         '../content/browser/child_process_security_policy_browsertest.cc',
         '../content/browser/device_orientation/device_orientation_browsertest.cc',
         '../content/browser/download/mhtml_generation_browsertest.cc',
         '../content/browser/file_system/file_system_browsertest.cc',
@@ skipping 20 matching lines @@
           'extension': 'js',
           'msvs_external_rule': 1,
           'inputs': [
             '<(gypv8sh)',
             '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
             '<(mock_js)',
             '<(test_api_js)',
             '<(js2gtest)',
           ],
           'outputs': [
-            '<(js2gtest_out_dir)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc',
+            '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',
             '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
           ],
           'process_outputs_as_sources': 1,
           'action': [
             'python',
             '<@(_inputs)',
             'webui',
             '<(RULE_INPUT_PATH)',
             'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
             '<@(_outputs)',
@@ skipping 1523 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }