Revert 108391 - Broke 'compile' on Mac clobber builder

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',
       'test/automation/browser_proxy.h',
       'test/automation/tab_proxy.cc',
       'test/automation/tab_proxy.h',
@@ skipping 1913 matching lines @@
         'service/service_process_unittest.cc',
         'test/base/browser_with_test_window_test.cc',
         'test/base/browser_with_test_window_test.h',
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/menu_model_test.cc',
         'test/base/menu_model_test.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
-        'test/data/unit/framework_unittest.js',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
         '../content/browser/renderer_host/text_input_client_mac_unittest.mm',
         '../content/browser/tab_contents/navigation_controller_unittest.cc',
         '../content/browser/tab_contents/render_view_host_manager_unittest.cc',
         '../content/common/sandbox_mac_diraccess_unittest.mm',
         '../content/common/sandbox_mac_fontloading_unittest.mm',
         '../content/common/sandbox_mac_unittest_helper.h',
         '../content/common/sandbox_mac_unittest_helper.mm',
         '../content/common/sandbox_mac_system_access_unittest.mm',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
         '../webkit/fileapi/file_system_operation_write_unittest.cc',
         '../webkit/fileapi/file_system_url_request_job_unittest.cc',
         '../webkit/fileapi/file_writer_delegate_unittest.cc',
         '../webkit/fileapi/file_system_test_helper.cc',
         '../webkit/fileapi/file_system_test_helper.h',
         '../webkit/quota/mock_storage_client.cc',
         '../webkit/quota/mock_storage_client.h',
       ],
-      'rules': [
-        {
-          'rule_name': 'js2unit',
-          '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',
-            '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-          ],
-          'process_outputs_as_sources': 1,
-          'action': [
-            'python',
-            '<@(_inputs)',
-            'unit',
-            '<(RULE_INPUT_PATH)',
-            'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
-            '<@(_outputs)',
-          ],
-        },
-      ],
       'conditions': [
         ['p2p_apis==1', {
           'sources': [
             '../content/browser/renderer_host/p2p/socket_host_test_utils.h',
             '../content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
             '../content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
             '../content/browser/renderer_host/p2p/socket_host_udp_unittest.cc',
             '../content/renderer/p2p/p2p_transport_impl_unittest.cc',
           ],
         }],
@@ skipping 293 matching lines @@
           ],
         }],
       ],
     },
     {
       # Executable that runs each browser test in a new process.
       'target_name': 'browser_tests',
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
+      'variables': {
+        'gypv8sh': '../tools/gypv8sh.py',
+        'js2webui': 'browser/ui/webui/javascript2webui.js',
+        'js2webui_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2webui',
+        'mock_js': 'third_party/mock4js/mock4js.js',
+        'test_api_js': 'test/data/webui/test_api.js',
+      },
       'dependencies': [
         'browser',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
         'chrome_resources',
         'chrome_strings',
         'renderer',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ skipping 334 matching lines @@
       'rules': [
         {
           'rule_name': 'js2webui',
           'extension': 'js',
           'msvs_external_rule': 1,
           'inputs': [
             '<(gypv8sh)',
             '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
             '<(mock_js)',
             '<(test_api_js)',
-            '<(js2gtest)',
+            '<(js2webui)',
           ],
           'outputs': [
-            '<(js2gtest_out_dir)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc',
+            '<(js2webui_out_dir)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).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)',
           ],
         },
       ],
       'conditions': [
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
@@ skipping 1498 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'
 }