[Chromoting] Remove CRD-specific JS files from AppRemoting build.

Recent refactoring allows us to remove many CRD-specific files from
the set of "common" JS files. This cl moves the CRD UI JS files
out of the AppRemoting build. This is in preparation for removing
Application.Mode in a follow-up cl.

Requires that crrev.com/1109453005 land first.

BUG=

Review URL: https://codereview.chromium.org/1095203010

Cr-Commit-Position: refs/heads/master@{#327205}

3 files changed, 51 insertions, 30 deletions

diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index ac1f3d5..ee5c5a70 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -347,7 +347,7 @@
       'variables': {
         'output_dir': '<(PRODUCT_DIR)/remoting/unittests',
         'webapp_js_files': [
-          '<@(remoting_webapp_shared_main_html_js_files)',
+          '<@(remoting_webapp_unittest_html_all_js_files)',
           '<@(remoting_webapp_wcs_sandbox_html_js_files)',
           '<@(remoting_webapp_background_html_js_files)',
         ]
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 494bbde..60d7b4b 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -167,7 +167,6 @@
       'webapp/crd/js/connected_view.js',
       'webapp/crd/js/connection_info.js',
       'webapp/crd/js/credentials_provider.js',
-      'webapp/crd/js/desktop_connected_view.js',
       'webapp/crd/js/host_desktop.js',
       'webapp/crd/js/smart_reconnector.js',
       'webapp/crd/js/video_frame_recorder.js',
@@ -240,22 +239,38 @@
       'webapp/crd/js/xmpp_login_handler.js',
       'webapp/crd/js/xmpp_stream_parser.js',
     ],
-    # UI JavaScript files.
+    # 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/connection_stats.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/l10n.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/ui_mode.js',
       'webapp/crd/js/toolbar.js',
       'webapp/crd/js/window_frame.js',
     ],
@@ -288,17 +303,17 @@
       #'<@(remoting_webapp_browsertest_all_js_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': [
       '<@(remoting_webapp_shared_main_html_js_files)',
-      'webapp/crd/js/crd_auth_dialog.js',
-      'webapp/crd/js/crd_event_handlers.js',
-      'webapp/crd/js/crd_experimental.js',
+      '<@(remoting_webapp_crd_js_ui_files)',
       'webapp/crd/js/crd_main.js',
-      'webapp/crd/js/desktop_remoting.js',
-      'webapp/crd/js/desktop_remoting_activity.js',
-      'webapp/crd/js/it2me_activity.js',
-      'webapp/crd/js/me2me_activity.js',
     ],
 
     # These template files are used to construct main.html.
diff --git a/remoting/webapp/files.gni b/remoting/webapp/files.gni
index 263bb5f..ad84123 100644
--- a/remoting/webapp/files.gni
+++ b/remoting/webapp/files.gni
@@ -165,7 +165,6 @@ remoting_webapp_js_client_files = [
   "crd/js/connected_view.js",
   "crd/js/connection_info.js",
   "crd/js/credentials_provider.js",
-  "crd/js/desktop_connected_view.js",
   "crd/js/host_desktop.js",
   "crd/js/smart_reconnector.js",
   "crd/js/video_frame_recorder.js",
@@ -247,18 +246,35 @@ remoting_webapp_js_signaling_files = [
 remoting_webapp_js_ui_files = [
   "base/js/viewport.js",
   "base/js/window_shape.js",
+  "crd/js/connection_stats.js",
+  "crd/js/feedback.js",
+  "crd/js/l10n.js",
+  "crd/js/ui_mode.js",
+]
+
+#
+# DesktopRemoting-specific JS files.
+#
+
+# The CRD-specific JavaScript files required by main.html.
+remoting_webapp_crd_js_ui_files = [
   "crd/js/bump_scroller.js",
   "crd/js/butter_bar.js",
-  "crd/js/connection_stats.js",
+  "crd/js/crd_auth_dialog.js",
+  "crd/js/crd_event_handlers.js",
+  "crd/js/crd_experimental.js",
+  "crd/js/crd_main.js",
+  "crd/js/desktop_connected_view.js",
+  "crd/js/desktop_remoting.js",
+  "crd/js/desktop_remoting_activity.js",
   "crd/js/desktop_viewport.js",
-  "crd/js/feedback.js",
   "crd/js/fullscreen.js",
   "crd/js/fullscreen_v1.js",
   "crd/js/fullscreen_v2.js",
-  "crd/js/l10n.js",
+  "crd/js/it2me_activity.js",
+  "crd/js/me2me_activity.js",
   "crd/js/menu_button.js",
   "crd/js/options_menu.js",
-  "crd/js/ui_mode.js",
   "crd/js/toolbar.js",
   "crd/js/window_frame.js",
 ]
@@ -287,17 +303,7 @@ remoting_webapp_shared_main_html_js_files =
 
 # The CRD-specific JavaScript files required by main.html.
 remoting_webapp_crd_main_html_all_js_files =
-    remoting_webapp_shared_main_html_js_files
-remoting_webapp_crd_main_html_all_js_files += [
-  "crd/js/crd_auth_dialog.js",
-  "crd/js/crd_event_handlers.js",
-  "crd/js/crd_experimental.js",
-  "crd/js/crd_main.js",
-  "crd/js/desktop_remoting.js",
-  "crd/js/desktop_remoting_activity.js",
-  "crd/js/it2me_activity.js",
-  "crd/js/me2me_activity.js",
-]
+    remoting_webapp_shared_main_html_js_files + remoting_webapp_crd_js_ui_files
 
 # These template files are used to construct main.html.
 remoting_webapp_template_files = [