Revert of [AppRemoting] Break out AppRemoting shared module (re-land).

remoting/app_remoting_webapp_build.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.
 
 {
   'includes': [
     'remoting_version.gypi',
     'remoting_locales.gypi',
     'remoting_options.gypi',
     'remoting_webapp_files.gypi',
@@ skipping 22 matching lines @@
       'ar_app_manifest_app':
         '>(ar_app_path)/manifest.json.jinja2',
       'ar_app_manifest_common':
         'webapp/app_remoting/manifest_common.json.jinja2',
       'ar_app_specific_files': [
         '>(ar_app_path)/icon16.png',
         '>(ar_app_path)/icon48.png',
         '>(ar_app_path)/icon128.png',
         '>(ar_app_path)/loading_splash.png',
       ],
+      'ar_generated_html_files': [
+        '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
+        '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
+        '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
+        '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
+        '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html',
+      ],
       'ar_webapp_files': [
         '<@(ar_app_specific_files)',
-        '<@(ar_vendor_js_files)',
-        '<@(ar_vendor_html_files)',
+        '<@(ar_shared_resource_files)',
+        '<@(ar_all_js_files)',
+        '<@(ar_generated_html_files)',
       ],
       'output_dir': '<(PRODUCT_DIR)/app_streaming/<@(ar_service_environment)/>(_target_name)',
       'zip_path': '<(PRODUCT_DIR)/app_streaming/<@(ar_service_environment)/>(_target_name).zip',
       'remoting_app_id': [],
       'remoting_app_name': '>(_app_name)',
       'remoting_app_description': '>(_app_description)',
 
       'ar_webapp_locales_listfile': '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)_locales.txt',
 
       'conditions': [
@@ skipping 30 matching lines @@
         ],
       },
       {
         'action_name': 'Build ">(ar_app_name)" application stub',
         'inputs': [
           '<(DEPTH)/remoting/webapp/build-webapp.py',
           '<(chrome_version_path)',
           '<(remoting_version_path)',
           '<@(ar_webapp_files)',
           '<@(remoting_webapp_locale_files)',
+          '<@(ar_generated_html_files)',
           '<(ar_app_manifest_app)',
           '<(DEPTH)/remoting/<(ar_app_manifest_common)',
           '<(ar_webapp_locales_listfile)',
         ],
         'outputs': [
           '<(output_dir)',
           '<(zip_path)',
         ],
         'action': [
           'python', '<(DEPTH)/remoting/webapp/build-webapp.py',
@@ skipping 39 matching lines @@
           '<(ar_main_template)',
           '--template-dir',
           '<(DEPTH)/remoting',
           '--templates',
           '<@(ar_main_template_files)',
           '--js',
           '<@(ar_main_js_files)',
         ],
       },
       {
-        'action_name': 'Build ">(ar_app_name)" ar_background.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(ar_background_template)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
-          '<(ar_background_template)',
-          '--template-dir',
-          '<(DEPTH)/remoting',
-          '--js',
-          '<@(ar_background_html_js_files)',
-        ],
-      },
-      {
         'action_name': 'Build ">(ar_app_name)" wcs_sandbox.html',
         'inputs': [
           '<(DEPTH)/remoting/webapp/build-html.py',
           '<(remoting_webapp_template_wcs_sandbox)',
         ],
         'outputs': [
           '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
         ],
         'action': [
           'python', '<(DEPTH)/remoting/webapp/build-html.py',
@@ skipping 66 matching lines @@
         # rather than using the extension id.
         # This is only done for Dev apps because the app-id for Release apps
         # *must* match the extension id.
         'variables': {
           'remoting_app_id': ['--appid', '>(_app_id)'],
         },
       }],
     ],  # conditions
   },  # target_defaults
 }