Retire gtestjs unit tests

remoting/remoting_test.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     # Remoting unit tests
     {
       'target_name': 'remoting_unittests',
       'type': '<(gtest_target_type)',
@@ skipping 22 matching lines @@
         'remoting_protocol',
         'remoting_resources',
       ],
       'defines': [
         'VERSION=<(version_full)',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
-        '../chrome/test/base/run_all_remoting_unittests.cc',
+        'base/run_all_unittests.cc',

[garykac, 2014/07/15 23:23:42]

alpha order

[kelvinp, 2014/07/16 00:17:55]

Done.

         'base/auth_token_util_unittest.cc',
         'base/auto_thread_task_runner_unittest.cc',
         'base/auto_thread_unittest.cc',
         'base/breakpad_win_unittest.cc',
         'base/capabilities_unittest.cc',
         'base/compound_buffer_unittest.cc',
         'base/rate_counter_unittest.cc',
         'base/resources_unittest.cc',
         'base/rsa_key_pair_unittest.cc',
         'base/running_average_unittest.cc',
         'base/test_rsa_key_pair.h',
         'base/typed_buffer_unittest.cc',
         'base/util_unittest.cc',
         'client/audio_player_unittest.cc',
-        'client/client_status_logger_unittest.cc',
+        'client/client_status_logger_unittest.cc',
         'client/key_event_mapper_unittest.cc',
         'client/plugin/normalizing_input_filter_cros_unittest.cc',
         'client/plugin/normalizing_input_filter_mac_unittest.cc',
         'client/server_log_entry_client_unittest.cc',
         'codec/audio_encoder_opus_unittest.cc',
         'codec/codec_test.cc',
         'codec/codec_test.h',
         'codec/video_decoder_vpx_unittest.cc',
         'codec/video_encoder_verbatim_unittest.cc',
         'codec/video_encoder_vpx_unittest.cc',
@@ skipping 49 matching lines @@
         'host/video_frame_recorder_unittest.cc',
         'host/video_scheduler_unittest.cc',
         'host/win/rdp_client_unittest.cc',
         'host/win/worker_process_launcher.cc',
         'host/win/worker_process_launcher.h',
         'host/win/worker_process_launcher_unittest.cc',
         'jingle_glue/chromium_socket_factory_unittest.cc',
         'jingle_glue/fake_signal_strategy.cc',
         'jingle_glue/fake_signal_strategy.h',
         'jingle_glue/iq_sender_unittest.cc',
-        'jingle_glue/log_to_server_unittest.cc',
+        'jingle_glue/log_to_server_unittest.cc',
         'jingle_glue/mock_objects.cc',
         'jingle_glue/mock_objects.h',
         'jingle_glue/network_settings_unittest.cc',
         'jingle_glue/server_log_entry_unittest.cc',
         'jingle_glue/server_log_entry_unittest.h',
         'protocol/authenticator_test_base.cc',
         'protocol/authenticator_test_base.h',
         'protocol/buffered_socket_writer_unittest.cc',
         'protocol/channel_multiplexer_unittest.cc',
         'protocol/clipboard_echo_filter_unittest.cc',
@@ skipping 31 matching lines @@
           'include_dirs': [
             '../breakpad/src',
           ],
           'link_settings': {
             'libraries': [
               '-lrpcrt4.lib',
               '-lwtsapi32.lib',
             ],
           },
         }],
-        [ 'OS=="mac" or (OS=="linux" and chromeos==0)', {
-          # Javascript unittests are disabled on CrOS because they cause
-          # valgrind and test errors.
-          #
-          # Javascript unittests are disabled on Windows because they add a
-          # dependency on 'common_constants' which (only on Windows) requires
-          # additional dependencies:
-          #   '../content/content.gyp:content_common',
-          #   'installer_util',
-          # These targets are defined in .gypi files that would need to be
-          # included here:
-          #   '../chrome/chrome_common.gypi',
-          #   '../chrome/chrome_installer.gypi',
-          #   '../chrome/chrome_installer_util.gypi',
-          # But we can't do that because ninja will complain about multiple
-          # target definitions.
-          # TODO(garykac): Move installer_util into a proper .gyp file so that
-          # it can be included in multiple .gyp files.
-          'includes': [
-            '../chrome/js_unittest_rules.gypi',
-          ],
-          'dependencies': [
-            '../chrome/common_constants.gyp:common_constants',
-            '../v8/tools/gyp/v8.gyp:v8',
-          ],
-          'sources': [
-            '../chrome/test/base/v8_unit_test.cc',
-            '../chrome/test/base/v8_unit_test.h',
-            'webapp/browser_globals.gtestjs',
-            'webapp/all_js_load.gtestjs',
-            'webapp/format_iq.gtestjs',
-            '<@(remoting_webapp_all_js_files)',
-          ],
-        }],
         [ 'OS=="android"', {
           'dependencies!': [
             'remoting_client_plugin',
           ],
         }],
         [ 'OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
@@ skipping 33 matching lines @@
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
         'remoting_base',
       ],
       'defines': [
         'VERSION=<(version_full)',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
-        '../chrome/test/base/run_all_remoting_unittests.cc',
+        'base/run_all_unittests.cc',
         'codec/codec_test.cc',
         'codec/codec_test.h',
         'codec/video_encoder_vpx_perftest.cc',
       ],
       'conditions': [
         [ 'OS=="mac" or (OS=="linux" and chromeos==0)', {
           # RunAllTests calls chrome::RegisterPathProvider() under Mac and
           # Linux, so we need the chrome_common.gypi dependency.
           'dependencies': [
             '../chrome/common_constants.gyp:common_constants',
@@ skipping 45 matching lines @@
             '--output', '<@(_outputs)',
            ],
         },
       ], # end of actions
     },  # end of target 'remoting_browser_test_resources'
     {
       'target_name': 'remoting_webapp_unittest',
       'type': 'none',
       'variables': {
         'output_dir': '<(PRODUCT_DIR)/remoting/unittests',
+        'webapp_js_files': [
+          '<@(remoting_webapp_main_html_js_files)',
+          '<@(remoting_webapp_js_wcs_sandbox_files)',
+        ]
       },
       'copies': [
         {
           'destination': '<(output_dir)/qunit',
           'files': [
             '../third_party/qunit/src/browser_test_harness.js',
             '../third_party/qunit/src/qunit.css',
             '../third_party/qunit/src/qunit.js',
           ],
         },
         {
           'destination': '<(output_dir)/blanketjs',
           'files': [
             '../third_party/blanketjs/src/blanket.js',
             '../third_party/blanketjs/src/qunit_adapter.js',
           ],
         },
         {
           'destination': '<(output_dir)/sinonjs',
           'files': [
             '../third_party/sinonjs/src/sinon.js',
             '../third_party/sinonjs/src/sinon-qunit.js',
           ],
         },
         {
           'destination': '<(output_dir)',
           'files': [
-            '<@(remoting_webapp_main_html_js_files)',
+            '<@(webapp_js_files)',
           ],
         },
         {
           'destination': '<(output_dir)',
           'files': [
             '<@(remoting_webapp_unittest_cases)'
           ],
         },
       ],
       'actions': [
         {
           'action_name': 'Build Remoting Webapp unittest.html',
           'inputs': [
             'webapp/build-html.py',
             '<(remoting_webapp_unittest_template_main)',
-            '<@(remoting_webapp_main_html_js_files)',
+            '<@(webapp_js_files)',
             '<@(remoting_webapp_unittest_cases)'
           ],
           'outputs': [
             '<(output_dir)/unittest.html',
           ],
           'action': [
             'python', 'webapp/build-html.py',
             '<@(_outputs)',
             '<(remoting_webapp_unittest_template_main)',
             # GYP automatically removes subsequent duplicated command line
             # arguments.  Therefore, the excludejs flag must be set before the
             # instrumentedjs flag or else GYP will ignore the files in the
             # exclude list.
             '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)',
             '--js', '<@(remoting_webapp_unittest_cases)',
-            '--instrument-js', '<@(remoting_webapp_main_html_js_files)',
+            '--instrument-js', '<@(webapp_js_files)',
            ],
         },
       ],
     },  # end of target 'remoting_webapp_js_unittest'
   ],  # end of targets
 }