[Chromoting] Move shared webapp JS files from crd/js -> base/js

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.
 
 # `7MM"""Mq.                       `7MM
 #   MM   `MM.                        MM
 #   MM   ,M9  .gP"Ya   ,6"Yb.   ,M""bMM  `7MMpMMMb.pMMMb.  .gP"Ya
 #   MMmmdM9  ,M'   Yb 8)   MM ,AP    MM    MM    MM    MM ,M'   Yb
 #   MM  YM.  8M""""""  ,pm9MM 8MI    MM    MM    MM    MM 8M""""""
 #   MM   `Mb.YM.    , 8M   MM `Mb    MM    MM    MM    MM YM.    ,
@@ skipping 63 matching lines @@
       'webapp/crd/js/background.js',
     ],
     # The unit test cases for the webapp
     'remoting_webapp_unittests_js_files': [
       # TODO(jrw): Move spy_promise to base.
       'webapp/unittests/spy_promise.js',
       'webapp/unittests/spy_promise_unittest.js',
       'webapp/base/js/base_unittest.js',
       'webapp/base/js/base_event_hook_unittest.js',
       'webapp/base/js/base_inherits_unittest.js',
+      'webapp/base/js/client_session_unittest.js',
+      'webapp/base/js/client_session_factory_unittest.js',
+      'webapp/base/js/dns_blackhole_checker_unittest.js',
+      'webapp/base/js/error_unittest.js',
+      'webapp/base/js/fallback_signal_strategy_unittest.js',
+      'webapp/base/js/identity_unittest.js',
       'webapp/base/js/ipc_unittest.js',
+      'webapp/base/js/l10n_unittest.js',
       'webapp/base/js/protocol_extension_manager_unittest.js',
+      'webapp/base/js/typecheck_unittest.js',
       'webapp/base/js/viewport_unittest.js',
+      'webapp/base/js/xhr_unittest.js',
+      'webapp/base/js/xmpp_connection_unittest.js',
+      'webapp/base/js/xmpp_login_handler_unittest.js',
+      'webapp/base/js/xmpp_stream_parser_unittest.js',
       'webapp/crd/js/apps_v2_migration_unittest.js',
-      'webapp/crd/js/client_session_unittest.js',
-      'webapp/crd/js/client_session_factory_unittest.js',
-      'webapp/crd/js/dns_blackhole_checker_unittest.js',
-      'webapp/crd/js/error_unittest.js',
-      'webapp/crd/js/fallback_signal_strategy_unittest.js',
       'webapp/crd/js/gcd_client_unittest.js',
       'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js',
       'webapp/crd/js/host_controller_unittest.js',
       'webapp/crd/js/host_daemon_facade_unittest.js',
       'webapp/crd/js/host_list_api_impl_unittest.js',
       'webapp/crd/js/host_table_entry_unittest.js',
-      'webapp/crd/js/identity_unittest.js',
-      'webapp/crd/js/l10n_unittest.js',
       'webapp/crd/js/menu_button_unittest.js',
       'webapp/crd/js/mock_xhr_unittest.js',
-      'webapp/crd/js/typecheck_unittest.js',
-      'webapp/crd/js/xhr_unittest.js',
-      'webapp/crd/js/xmpp_connection_unittest.js',
-      'webapp/crd/js/xmpp_login_handler_unittest.js',
-      'webapp/crd/js/xmpp_stream_parser_unittest.js',
     ],
     'remoting_webapp_unittests_js_mock_files': [
       # Some proto files can be repurposed as simple mocks for the unittests.
       # Note that some defs in chrome_proto are overwritten by chrome_mocks.
       'webapp/crd/js/mock_client_plugin.js',
       'webapp/crd/js/mock_host_daemon_facade.js',
       'webapp/crd/js/mock_host_list_api.js',
       'webapp/crd/js/mock_identity.js',
       'webapp/crd/js/mock_signal_strategy.js',
       'webapp/js_proto/chrome_proto.js',
@@ skipping 15 matching lines @@
     ],
     # All the files needed to run the unittests.
     'remoting_webapp_unittests_all_files': [
       'webapp/crd/html/menu_button.css',
       '<@(remoting_webapp_unittests_all_js_files)',
     ],
     'remoting_webapp_unittests_template_main':
       'webapp/crd/html/template_unittests.html',
 
     #
-    # Webapp JavaScript file groups.
+    # Shared webapp JavaScript file groups.
+    #
+
+    # Auth (Google account) JavaScript files.
+    'remoting_webapp_shared_js_auth_google_files': [
+      'webapp/base/js/auth_init.js',
+      'webapp/base/js/identity.js',
+      'webapp/base/js/oauth2.js',
+      'webapp/base/js/oauth2_api.js',
+      'webapp/base/js/oauth2_api_impl.js',
+    ],
+    # Client JavaScript files.
+    'remoting_webapp_shared_js_client_files': [
+      'webapp/base/js/activity.js',
+      'webapp/base/js/client_plugin.js',
+      'webapp/base/js/client_plugin_host_desktop_impl.js',
+      'webapp/base/js/client_plugin_impl.js',
+      'webapp/base/js/client_session.js',
+      'webapp/base/js/client_session_factory.js',
+      'webapp/base/js/clipboard.js',
+      'webapp/base/js/connected_view.js',
+      'webapp/base/js/connection_info.js',
+      'webapp/base/js/credentials_provider.js',
+      'webapp/base/js/host_desktop.js',
+      'webapp/base/js/smart_reconnector.js',
+    ],
+    # Remoting core JavaScript files.
+    'remoting_webapp_shared_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/modal_dialogs.js',
+      'webapp/base/js/platform.js',
+      'webapp/base/js/protocol_extension_manager.js',
+      'webapp/base/js/protocol_extension.js',
+      'webapp/base/js/error.js',
+      'webapp/base/js/plugin_settings.js',
+      'webapp/base/js/typecheck.js',
+      'webapp/base/js/xhr.js',
+    ],
+    # Host JavaScript files.
+    'remoting_webapp_shared_js_host_files': [
+      'webapp/base/js/host.js',
+      'webapp/base/js/host_settings.js',
+    ],
+    # Logging and stats JavaScript files.
+    'remoting_webapp_shared_js_logging_files': [
+      'webapp/base/js/format_iq.js',
+      'webapp/base/js/log_to_server.js',
+      'webapp/base/js/server_log_entry.js',
+      'webapp/base/js/stats_accumulator.js',
+    ],
+    # Remoting signaling files.
+    'remoting_webapp_shared_js_signaling_files': [
+      'webapp/base/js/dns_blackhole_checker.js',
+      'webapp/base/js/fallback_signal_strategy.js',
+      'webapp/base/js/signal_strategy.js',
+      'webapp/base/js/tcp_socket.js',
+      'webapp/base/js/wcs_adapter.js',
+      'webapp/base/js/wcs_sandbox_container.js',
+      'webapp/base/js/xmpp_connection.js',
+      'webapp/base/js/xmpp_login_handler.js',
+      'webapp/base/js/xmpp_stream_parser.js',
+    ],
+    # Shared UI JavaScript files.
+    'remoting_webapp_shared_js_ui_files': [
+      'webapp/base/js/connection_stats.js',
+      'webapp/base/js/l10n.js',
+      'webapp/base/js/ui_mode.js',
+      'webapp/base/js/viewport.js',
+      'webapp/base/js/window_shape.js',
+    ],
+
+    #
+    # DesktopRemoting 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_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/activity.js',
-      'webapp/crd/js/client_plugin.js',
-      'webapp/crd/js/client_plugin_impl.js',
-      'webapp/crd/js/client_plugin_host_desktop_impl.js',
-      'webapp/crd/js/client_session.js',
-      'webapp/crd/js/client_session_factory.js',
-      'webapp/crd/js/clipboard.js',
-      'webapp/crd/js/connected_view.js',
-      'webapp/crd/js/connection_info.js',
-      'webapp/crd/js/credentials_provider.js',
-      'webapp/crd/js/host_desktop.js',
-      'webapp/crd/js/smart_reconnector.js',
+      'webapp/crd/js/apps_v2_migration.js',
+      'webapp/crd/js/event_handlers.js',
+      'webapp/crd/js/gcd_client.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/modal_dialogs.js',
-      'webapp/base/js/platform.js',
-      'webapp/base/js/protocol_extension_manager.js',
-      'webapp/base/js/protocol_extension.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',
-      'webapp/crd/js/typecheck.js',
-      'webapp/crd/js/xhr.js',
-      'webapp/crd/js/gcd_client.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',
       'webapp/crd/js/host_screen.js',
       'webapp/crd/js/host_session.js',
       'webapp/crd/js/host_setup_dialog.js',
       'webapp/crd/js/host_install_dialog.js',
       'webapp/crd/js/host_installer.js',
       'webapp/crd/js/it2me_host_facade.js',
       'webapp/crd/js/paired_client_manager.js',
     ],
     # Files for displaying (in the client) info about available hosts.
     'remoting_webapp_js_host_display_files': [
       'webapp/crd/js/host_list.js',
       'webapp/crd/js/host_list_api.js',
       'webapp/crd/js/host_list_api_gcd_impl.js',
       'webapp/crd/js/host_list_api_impl.js',
       'webapp/crd/js/host_table_entry.js',
       'webapp/crd/js/local_host_section.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/tcp_socket.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',
-    ],
-    # Shared UI JavaScript files.
-    'remoting_webapp_js_ui_files': [
-      'webapp/base/js/viewport.js',
-      'webapp/base/js/window_shape.js',
-      'webapp/crd/js/connection_stats.js',
-      'webapp/crd/js/feedback.js',
-      'webapp/crd/js/l10n.js',
-      'webapp/crd/js/ui_mode.js',
-    ],
-
-    #
-    # DesktopRemoting-specific JS files.
-    #
-
     # The CRD-specific JavaScript files required by main.html.
     'remoting_webapp_crd_js_ui_files': [
       'webapp/crd/js/bump_scroller.js',
       'webapp/crd/js/butter_bar.js',
       'webapp/crd/js/crd_auth_dialog.js',
       'webapp/crd/js/crd_event_handlers.js',
       'webapp/crd/js/crd_experimental.js',
       'webapp/crd/js/desktop_connected_view.js',
       'webapp/crd/js/desktop_remoting.js',
       'webapp/crd/js/desktop_remoting_activity.js',
       'webapp/crd/js/desktop_viewport.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/it2me_activity.js',
       'webapp/crd/js/me2me_activity.js',
       'webapp/crd/js/menu_button.js',
       'webapp/crd/js/options_menu.js',
       'webapp/crd/js/toolbar.js',
       'webapp/crd/js/window_frame.js',
     ],
 
     #
     # DesktopRemoting main.html generation files.
     #
 
     'remoting_webapp_template_main':
       '<(DEPTH)/remoting/webapp/crd/html/template_main.html',
 
     # The shared JavaScript files required by main.html.
+    # These files are shared with the unittest target.
     '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_shared_js_core_files)',
+      '<@(remoting_webapp_shared_js_auth_google_files)',
+      '<@(remoting_webapp_shared_js_client_files)',
+      '<@(remoting_webapp_shared_js_host_files)',
+      '<@(remoting_webapp_shared_js_logging_files)',
+      '<@(remoting_webapp_shared_js_signaling_files)',
+      '<@(remoting_webapp_shared_js_ui_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)',
     ],
 
     # The JS files required by unittest.html.
     'remoting_webapp_unittest_html_all_js_files': [
       '<@(remoting_webapp_shared_main_html_js_files)',
       '<@(remoting_webapp_crd_js_ui_files)',
     ],
 
     # The CRD-specific JavaScript files required by main.html.
     'remoting_webapp_crd_main_html_all_js_files': [
@@ skipping 42 matching lines @@
       'webapp/base/js/message_window_manager.js',
       'webapp/crd/js/activation_handler.js',
       'webapp/crd/js/app_launcher.js',
       'webapp/crd/js/background.js',
     ],
 
     # All the JavaScript files required by background.html.
     'remoting_webapp_background_html_all_js_files': [
       '<@(remoting_webapp_background_html_js_files)',
       'webapp/base/js/base.js',
+      'webapp/base/js/client_session.js',
+      'webapp/base/js/error.js',
+      'webapp/base/js/identity.js',
       'webapp/base/js/ipc.js',
-      'webapp/crd/js/client_session.js',
-      'webapp/crd/js/error.js',
+      'webapp/base/js/l10n.js',
+      'webapp/base/js/oauth2.js',
+      'webapp/base/js/oauth2_api.js',
+      'webapp/base/js/oauth2_api_impl.js',
+      'webapp/base/js/plugin_settings.js',
+      'webapp/base/js/typecheck.js',
+      'webapp/base/js/xhr.js',
       'webapp/crd/js/host_installer.js',
       'webapp/crd/js/host_session.js',
-      'webapp/crd/js/identity.js',
       'webapp/crd/js/it2me_host_facade.js',
-      'webapp/crd/js/l10n.js',
-      'webapp/crd/js/oauth2.js',
-      'webapp/crd/js/oauth2_api.js',
-      'webapp/crd/js/oauth2_api_impl.js',
-      'webapp/crd/js/plugin_settings.js',
-      'webapp/crd/js/typecheck.js',
-      'webapp/crd/js/xhr.js',
     ],
 
     #
     # Webapp wcs_sandbox.html generation files.
     #
 
     'remoting_webapp_template_wcs_sandbox':
       '<(DEPTH)/remoting/webapp/base/html/template_wcs_sandbox.html',
 
     # These JS files are specific to the WCS sandbox page and are not part of
     # the main JS files.
     'remoting_webapp_wcs_sandbox_html_js_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',
     ],
 
     # All the JavaScript files required by wcs_sandbox.html.
     'remoting_webapp_wcs_sandbox_html_all_js_files': [
       '<@(remoting_webapp_wcs_sandbox_html_js_files)',
-      'webapp/crd/js/error.js',
-      'webapp/crd/js/plugin_settings.js',
+      'webapp/base/js/error.js',
+      'webapp/base/js/plugin_settings.js',
     ],
 
     #
     # Webapp message_window.html generation files.
     #
 
     'remoting_webapp_template_message_window':
       '<(DEPTH)/remoting/webapp/base/html/template_message_window.html',
 
     # These JS files are specific to the message window page and are not part of
@@ skipping 81 matching lines @@
       '<(remoting_webapp_template_background)',
       '<(remoting_webapp_template_main)',
       '<(remoting_webapp_template_message_window)',
       '<(remoting_webapp_template_wcs_sandbox)',
       '<@(remoting_webapp_template_files)',
       '<@(remoting_webapp_crd_js_files)',
     ],
 
   },
 }