[Chromoting] Enable jscompile for browser tests.

remoting/remoting_webapp_files.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.
 
 {
   'variables': {
     'remoting_webapp_info_files': [
       'resources/chromoting16.webp',
       'resources/chromoting48.webp',
       'resources/chromoting128.webp',
     ],
 
     # Jscompile proto files.
     # These provide type information for jscompile.
     'remoting_webapp_js_proto_files': [
       'webapp/js_proto/chrome_proto.js',
       'webapp/js_proto/dom_proto.js',
       'webapp/js_proto/remoting_proto.js',
+      'webapp/js_proto/test_proto.js',
     ],
 
+    #
+    # Webapp browsertest and unittest JavaScript files.
+    #
+
+    # Mocks used by browsertests and unittests.
+    'remoting_webapp_test_js_mock_files': [
+      'webapp/js_proto/chrome_proto.js',
+      'webapp/unittests/chrome_mocks.js',
+      'webapp/unittests/mock_signal_strategy.js',
+    ],
+    # Browser test files.
+    'remoting_webapp_browsertest_js_files': [
+      'webapp/browser_test/browser_test.js',
+      'webapp/browser_test/bump_scroll_browser_test.js',
+      'webapp/browser_test/cancel_pin_browser_test.js',
+      'webapp/browser_test/invalid_pin_browser_test.js',
+      'webapp/browser_test/it2me_browser_test.js',
+      'webapp/browser_test/mock_client_plugin.js',
+      'webapp/browser_test/mock_host_list_api.js',
+      'webapp/browser_test/mock_identity.js',
+      'webapp/browser_test/mock_oauth2_api.js',
+      'webapp/browser_test/mock_session_connector.js',
+      'webapp/browser_test/scrollbar_browser_test.js',
+      'webapp/browser_test/timeout_waiter.js',
+      'webapp/browser_test/unauthenticated_browser_test.js',
+      'webapp/browser_test/update_pin_browser_test.js',
+    ],
+    'remoting_webapp_browsertest_js_all_files': [
+      '<@(remoting_webapp_browsertest_js_files)',
+      '<@(remoting_webapp_js_proto_files)',
+      '<@(remoting_webapp_test_js_mock_files)',
+    ],
+
+    # These product files are excluded from our JavaScript unittest
+    'remoting_webapp_unittest_js_exclude_files': [
+      # background.js is where the onLoad handler is defined, which
+      # makes it the entry point of the background page.
+      'webapp/crd/js/background.js',
+    ],
+    # The unit test cases for the webapp
+    'remoting_webapp_unittest_js_files': [
+      'webapp/unittests/apps_v2_migration_unittest.js',
+      'webapp/unittests/base_unittest.js',
+      'webapp/unittests/dns_blackhole_checker_unittest.js',
+      'webapp/unittests/event_hook_unittest.js',
+      'webapp/unittests/fallback_signal_strategy_unittest.js',
+      'webapp/unittests/ipc_unittest.js',
+      'webapp/unittests/it2me_helpee_channel_unittest.js',
+      'webapp/unittests/it2me_helper_channel_unittest.js',
+      'webapp/unittests/it2me_service_unittest.js',
+      'webapp/unittests/l10n_unittest.js',
+      'webapp/unittests/menu_button_unittest.js',
+      'webapp/unittests/xmpp_connection_unittest.js',
+      'webapp/unittests/xmpp_login_handler_unittest.js',
+      'webapp/unittests/xmpp_stream_parser_unittest.js',
+    ],
+    'remoting_webapp_unittest_js_all_files': [
+      '<@(remoting_webapp_js_proto_files)',
+      '<@(remoting_webapp_test_js_mock_files)',
+      '<@(remoting_webapp_unittest_js_files)',
+    ],
+    'remoting_webapp_unittest_all_files': [

[garykac, 2015/02/18 00:20:36]

Ditto

+      'webapp/crd/html/menu_button.css',
+      '<@(remoting_webapp_unittest_js_all_files)',
+    ],
+    'remoting_webapp_unittest_template_main':
+      'webapp/crd/html/template_unittest.html',
+
+    #
+    # Webapp JavaScript file groups.
+    #
+
     # Auth (apps v1) JavaScript files.
     # These files aren't included directly from main.html. They are
     # referenced from the manifest.json file (appsv1 only).
     'remoting_webapp_js_auth_v1_files': [
       'webapp/crd/js/cs_third_party_auth_trampoline.js',  # client to host
       'webapp/crd/js/cs_oauth2_trampoline.js',  # Google account
     ],
     # Auth (client to host) JavaScript files.
     'remoting_webapp_js_auth_client2host_files': [
       'webapp/crd/js/third_party_host_permissions.js',
       'webapp/crd/js/third_party_token_fetcher.js',
     ],
     # Auth (Google account) JavaScript files.
     'remoting_webapp_js_auth_google_files': [
       'webapp/base/js/auth_dialog.js',
       'webapp/base/js/auth_init.js',
       'webapp/crd/js/identity.js',
       'webapp/crd/js/oauth2.js',
       'webapp/crd/js/oauth2_api.js',
       'webapp/crd/js/oauth2_api_impl.js',
     ],
+    # Cast extension handler JavaScript files.
+    'remoting_webapp_js_cast_extension_files': [
+      'webapp/crd/js/cast_extension_handler.js',
+    ],
     # Client JavaScript files.
     'remoting_webapp_js_client_files': [
       'webapp/crd/js/client_plugin.js',
       'webapp/crd/js/client_plugin_impl.js',
       # TODO(garykac) For client_screen:
       # * Split out pin/access code stuff into separate file.
       # * Move client logic into session_connector
       'webapp/crd/js/client_screen.js',
       'webapp/crd/js/client_session.js',
       'webapp/crd/js/clipboard.js',
       'webapp/crd/js/desktop_connected_view.js',
       'webapp/crd/js/hangout_session.js',
       'webapp/crd/js/session_connector.js',
       'webapp/crd/js/session_connector_impl.js',
       'webapp/crd/js/smart_reconnector.js',
       'webapp/crd/js/video_frame_recorder.js',
     ],
     # Remoting core JavaScript files.
     'remoting_webapp_js_core_files': [
       'webapp/base/js/app_capabilities.js',
       'webapp/base/js/application.js',
       'webapp/base/js/base.js',
       'webapp/base/js/ipc.js',
       'webapp/base/js/platform.js',
       'webapp/crd/js/apps_v2_migration.js',
       'webapp/crd/js/error.js',
       'webapp/crd/js/event_handlers.js',
       'webapp/crd/js/plugin_settings.js',
-      # TODO(garykac) Split out UI client stuff from remoting.js.
       'webapp/crd/js/remoting.js',
       'webapp/crd/js/typecheck.js',
       'webapp/crd/js/xhr.js',
     ],
+    # Gnubby authentication JavaScript files.
+    'remoting_webapp_js_gnubby_auth_files': [
+      'webapp/crd/js/gnubby_auth_handler.js',
+    ],
     # Host JavaScript files.
     'remoting_webapp_js_host_files': [
       'webapp/crd/js/host.js',
       'webapp/crd/js/host_settings.js',
     ],
     # Files for controlling the local machine as a host.
     # Includes both it2me and me2me files.
     'remoting_webapp_js_host_control_files': [
       'webapp/crd/js/host_controller.js',
       'webapp/crd/js/host_daemon_facade.js',
@@ skipping 12 matching lines @@
       'webapp/crd/js/host_list_api_impl.js',
       'webapp/crd/js/host_table_entry.js',
     ],
     # Logging and stats JavaScript files.
     'remoting_webapp_js_logging_files': [
       'webapp/crd/js/format_iq.js',
       'webapp/crd/js/log_to_server.js',
       'webapp/crd/js/server_log_entry.js',
       'webapp/crd/js/stats_accumulator.js',
     ],
+    # Remoting signaling files.
+    'remoting_webapp_js_signaling_files': [
+      'webapp/crd/js/dns_blackhole_checker.js',
+      'webapp/crd/js/fallback_signal_strategy.js',
+      'webapp/crd/js/signal_strategy.js',
+      'webapp/crd/js/wcs_adapter.js',
+      'webapp/crd/js/wcs_sandbox_container.js',
+      'webapp/crd/js/xmpp_connection.js',
+      'webapp/crd/js/xmpp_login_handler.js',
+      'webapp/crd/js/xmpp_stream_parser.js',
+    ],
     # UI JavaScript files.
     'remoting_webapp_js_ui_files': [
       'webapp/base/js/window_shape.js',
       'webapp/crd/js/butter_bar.js',
       'webapp/crd/js/connection_stats.js',
       'webapp/crd/js/feedback.js',
       'webapp/crd/js/fullscreen.js',
       'webapp/crd/js/fullscreen_v1.js',
       'webapp/crd/js/fullscreen_v2.js',
       'webapp/crd/js/l10n.js',
       'webapp/crd/js/menu_button.js',
       'webapp/crd/js/options_menu.js',
       'webapp/crd/js/ui_mode.js',
       'webapp/crd/js/toolbar.js',
       'webapp/crd/js/window_frame.js',
     ],
-    # Remoting signaling files.
-    'remoting_webapp_js_signaling_files': [

[garykac, 2015/02/18 00:20:36]

Moved to fix alpha-order in this file.

-      'webapp/crd/js/dns_blackhole_checker.js',
-      'webapp/crd/js/fallback_signal_strategy.js',
-      'webapp/crd/js/signal_strategy.js',
-      'webapp/crd/js/wcs_adapter.js',
-      'webapp/crd/js/wcs_sandbox_container.js',
-      'webapp/crd/js/xmpp_connection.js',
-      'webapp/crd/js/xmpp_login_handler.js',
-      'webapp/crd/js/xmpp_stream_parser.js',
-    ],
     # Remoting WCS sandbox JavaScript files.
     'remoting_webapp_js_wcs_sandbox_files': [
       'webapp/crd/js/wcs.js',
       'webapp/crd/js/wcs_loader.js',
       'webapp/crd/js/wcs_sandbox_content.js',
       'webapp/crd/js/xhr_proxy.js',
     ],
-    # gnubby authentication JavaScript files.
-    'remoting_webapp_js_gnubby_auth_files': [
-      'webapp/crd/js/gnubby_auth_handler.js',
-    ],
-    # cast extension handler JavaScript files.
-    'remoting_webapp_js_cast_extension_files': [
-      'webapp/crd/js/cast_extension_handler.js',
-    ],
-    # Shared files for tests.
-    'remoting_webapp_js_test_common_files': [
-      'webapp/unittests/mock_signal_strategy.js',
-    ],
-    # browser test JavaScript files.
-    'remoting_webapp_js_browser_test_files': [
-      'webapp/browser_test/browser_test.js',
-      'webapp/browser_test/bump_scroll_browser_test.js',
-      'webapp/browser_test/cancel_pin_browser_test.js',
-      'webapp/browser_test/invalid_pin_browser_test.js',
-      'webapp/browser_test/it2me_browser_test.js',
-      'webapp/browser_test/mock_client_plugin.js',
-      'webapp/browser_test/mock_host_list_api.js',
-      'webapp/browser_test/mock_identity.js',
-      'webapp/browser_test/mock_oauth2_api.js',
-      'webapp/browser_test/mock_session_connector.js',
-      'webapp/browser_test/scrollbar_browser_test.js',
-      'webapp/browser_test/timeout_waiter.js',
-      'webapp/browser_test/unauthenticated_browser_test.js',
-      'webapp/browser_test/update_pin_browser_test.js',
-    ],
-    # These product files are excluded from our JavaScript unittest
-    'remoting_webapp_unittest_exclude_files': [
-      # background.js is where the onLoad handler is defined, which
-      # makes it the entry point of the background page.
-      'webapp/crd/js/background.js',
-    ],
-    # The unit test cases for the webapp
-    'remoting_webapp_unittest_js_files': [
-      'webapp/unittests/chrome_mocks.js',
-      'webapp/js_proto/chrome_proto.js',
-      'webapp/unittests/apps_v2_migration_unittest.js',
-      'webapp/unittests/base_unittest.js',
-      'webapp/unittests/dns_blackhole_checker_unittest.js',
-      'webapp/unittests/event_hook_unittest.js',
-      'webapp/unittests/fallback_signal_strategy_unittest.js',
-      'webapp/unittests/ipc_unittest.js',
-      'webapp/unittests/it2me_helpee_channel_unittest.js',
-      'webapp/unittests/it2me_helper_channel_unittest.js',
-      'webapp/unittests/it2me_service_unittest.js',
-      'webapp/unittests/l10n_unittest.js',
-      'webapp/unittests/menu_button_unittest.js',
-      'webapp/unittests/xmpp_connection_unittest.js',
-      'webapp/unittests/xmpp_login_handler_unittest.js',
-      'webapp/unittests/xmpp_stream_parser_unittest.js',
-    ],
-    'remoting_webapp_unittest_additional_files': [
-      'webapp/crd/html/menu_button.css',
-    ],
-    'remoting_webapp_unittest_template_main':
-      'webapp/crd/html/template_unittest.html',
 
     # The shared JavaScript files required by main.html.
     'remoting_webapp_shared_main_html_js_files': [
       # Include the core files first as it is required by the other files.
       # Otherwise, Jscompile will complain.
       '<@(remoting_webapp_js_core_files)',
       '<@(remoting_webapp_js_auth_client2host_files)',
       '<@(remoting_webapp_js_auth_google_files)',
       '<@(remoting_webapp_js_client_files)',
       '<@(remoting_webapp_js_gnubby_auth_files)',
       '<@(remoting_webapp_js_cast_extension_files)',
       '<@(remoting_webapp_js_host_files)',
       '<@(remoting_webapp_js_host_control_files)',
       '<@(remoting_webapp_js_host_display_files)',
       '<@(remoting_webapp_js_logging_files)',
       '<@(remoting_webapp_js_ui_files)',
       '<@(remoting_webapp_js_signaling_files)',
-      # Uncomment these lines to include browser test files in the web app
+      # Uncomment this line to include browser test files in the web app
       # to expedite debugging or local development.
-      # '<@(remoting_webapp_js_browser_test_files)',
-      # '<@(remoting_webapp_js_test_common_files)'
+      #'<@(remoting_webapp_browsertest_js_all_files)',
     ],
 
     # The CRD-specific JavaScript files required by main.html.
     'remoting_webapp_crd_main_html_js_files': [
       'webapp/crd/js/crd_connect.js',
       'webapp/crd/js/crd_event_handlers.js',
       'webapp/crd/js/crd_main.js',
       'webapp/crd/js/desktop_remoting.js',
     ],
 
@@ skipping 138 matching lines @@
       'webapp/crd/manifest.json.jinja2',
       '<(remoting_webapp_template_main)',
       '<(remoting_webapp_template_wcs_sandbox)',
       '<(remoting_webapp_template_background)',
       '<@(remoting_webapp_template_files)',
       '<@(remoting_webapp_crd_js_files)',
     ],
 
   },
 }