[Chromoting] Add ability to enable/disable GDrive support per-app in gyp.

Since not all AppRemoting apps will want or need GDrive support to be
enabled, we need to be able to control which apps enable this feature.

This cl adds 'app_features' to the AppRemoting gyp targets and passes
the list of features into the build_webapp script (so the manifest can
have the correct oauth scopes) and the webapp.

Also, because the 'cast' capability was "in the way" for these changes,
it has been converted into a feature as well (default: disabled).

BUG=

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

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

remoting/app_remoting_webapp.gyp

@@ -69,10 +69,12 @@
 
   'targets': [
     {
+      # Sample AppRemoting app.
       'target_name': 'ar_sample_app',
       'app_id': 'ljacajndfccfgnfohlgkdphmbnpkjflk',
       'app_name': 'App Remoting Client',
       'app_description': 'App Remoting client',
+      'app_capabilities': ['GOOGLE_DRIVE'],
     },
   ],  # end of targets
 }

remoting/app_remoting_webapp_build.gypi

@@ -122,6 +122,8 @@
           '<(remoting_app_name)',
           '--app_description',
           '<(remoting_app_description)',
+          '--app_capabilities',
+          '>@(_app_capabilities)',
           '--service_environment',
           '<@(ar_service_environment)',
         ],

remoting/remoting_webapp_files.gypi

@@ -57,6 +57,7 @@
     ],
     # 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',

remoting/webapp/app_remoting/js/app_remoting.js

@@ -213,19 +213,6 @@ remoting.AppRemoting.prototype.getDefaultRemapKeys = function() {
   return '';
 };
 
-/**
- * @return {Array.<string>} A list of |ClientSession.Capability|s required
- *     by this application.
- */
-remoting.AppRemoting.prototype.getRequiredCapabilities = function() {
-  return [
-    remoting.ClientSession.Capability.SEND_INITIAL_RESOLUTION,
-    remoting.ClientSession.Capability.RATE_LIMIT_RESIZE_REQUESTS,
-    remoting.ClientSession.Capability.VIDEO_RECORDER,
-    remoting.ClientSession.Capability.GOOGLE_DRIVE
-  ];
-};
-
 /**
  * Called when a new session has been connected.
  *

remoting/webapp/app_remoting/js/ar_main.js

@@ -11,7 +11,7 @@ var remoting = remoting || {};
  * Entry point ('load' handler) for App Remoting webapp.
  */
 remoting.startAppRemoting = function() {
-  remoting.app = new remoting.Application();
+  remoting.app = new remoting.Application(remoting.app_capabilities());
   var app_remoting = new remoting.AppRemoting(remoting.app);
   remoting.app.start();
 };

remoting/webapp/app_remoting/manifest_common.json.jinja2

@@ -49,7 +49,7 @@
   "oauth2": {
     "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
     "scopes": [
-      "https://www.googleapis.com/auth/appremoting.runapplication https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile https://docs.google.com/feeds/ https://www.googleapis.com/auth/drive"
+      "https://www.googleapis.com/auth/appremoting.runapplication https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile {{ OAUTH_GDRIVE_SCOPE }}"
     ]
   },
   "sandbox": {

remoting/webapp/base/js/app_capabilities.js

+// Copyright 2015 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.
+
+'use strict';
+
+/** @suppress {duplicate} */
+var remoting = remoting || {};
+
+/**
+ * Note that this needs to be a function because it gets expanded at
+ * compile-time into remoting.ClientSession.Capability enums and these
+ * are not guaranteed to be present yet when this file is loaded.
+ * @return {Array.<remoting.ClientSession.Capability>}
+ */
+remoting.app_capabilities = function() {
+  return ['APPLICATION_CAPABILITIES'];
+}

remoting/webapp/base/js/application.js

@@ -13,15 +13,22 @@
 var remoting = remoting || {};
 
 /**
+ * @param {Array.<string>} app_capabilities Array of application capabilities.
  * @constructor
  */
-remoting.Application = function() {
+remoting.Application = function(app_capabilities) {
   /**
    * @type {remoting.Application.Delegate}
    * @private
    */
   this.delegate_ = null;
 
+  /**
+   * @type {Array.<string>}
+   * @private
+   */
+  this.app_capabilities_ = app_capabilities;
+
   /**
    * @type {remoting.SessionConnector}
    * @private
@@ -37,6 +44,30 @@ remoting.Application.prototype.setDelegate = function(appDelegate) {
   this.delegate_ = appDelegate;
 };
 
+/**
+ * @return {Array.<string>} A list of |ClientSession.Capability|s required
+ *     by this application.
+ */
+remoting.Application.prototype.getRequiredCapabilities_ = function() {
+  var capabilities = [
+    remoting.ClientSession.Capability.SEND_INITIAL_RESOLUTION,
+    remoting.ClientSession.Capability.RATE_LIMIT_RESIZE_REQUESTS,
+    remoting.ClientSession.Capability.VIDEO_RECORDER
+  ];
+  // Append the app-specific capabilities.
+  capabilities.push.apply(capabilities, this.app_capabilities_);
+  return capabilities;
+};
+
+/**
+ * @param {remoting.ClientSession.Capability} capability
+ * @return {boolean}
+ */
+remoting.Application.prototype.hasCapability = function(capability) {
+  var capabilities = remoting.app.getRequiredCapabilities_();
+  return capabilities.indexOf(capability) != -1;
+};
+
 /**
  * Initialize the application and register all event handlers. After this
  * is called, the app is running and waiting for user events.
@@ -153,7 +184,7 @@ remoting.Application.prototype.getSessionConnector = function() {
         this.onError.bind(this),
         this.onExtensionMessage.bind(this),
         this.onConnectionFailed.bind(this),
-        this.delegate_.getRequiredCapabilities(),
+        this.getRequiredCapabilities_(),
         this.delegate_.getDefaultRemapKeys());
   }
   return this.session_connector_;
@@ -179,12 +210,6 @@ remoting.Application.Delegate.prototype.init = function(connector) {};
  */
 remoting.Application.Delegate.prototype.getDefaultRemapKeys = function() {};
 
-/**
- * @return {Array.<string>} A list of |ClientSession.Capability|s required
- *     by this application.
- */
-remoting.Application.Delegate.prototype.getRequiredCapabilities = function() {};
-
 /**
  * Called when a new session has been connected.
  *

remoting/webapp/build-webapp.py

@@ -75,10 +75,9 @@ def processJinjaTemplate(input_file, include_paths, output_file, context):
   rendered = template.render(context)
   io.open(output_file, 'w', encoding='utf-8').write(rendered)
 
-
 def buildWebApp(buildtype, version, destination, zip_path,
                 manifest_template, webapp_type, app_id, app_name,
-                app_description, files, locales, jinja_paths,
+                app_description, app_capabilities, files, locales, jinja_paths,
                 service_environment):
   """Does the main work of building the webapp directory and zipfile.
 
@@ -95,6 +94,8 @@ def buildWebApp(buildtype, version, destination, zip_path,
              test API server.
     app_name: A string with the name of the application.
     app_description: A string with the description of the application.
+    app_capabilities: A set of strings naming the capabilities that should be
+                      enabled for this application.
     files: An array of strings listing the paths for resources to include
            in this webapp.
     locales: An array of strings listing locales, which are copied, along
@@ -316,6 +317,12 @@ def buildWebApp(buildtype, version, destination, zip_path,
   replaceString(destination, 'API_CLIENT_ID', apiClientId)
   replaceString(destination, 'API_CLIENT_SECRET', apiClientSecret)
 
+  # Write the application capabilities.
+  appCapabilities = ','.join(
+      ['remoting.ClientSession.Capability.' + x for x in app_capabilities])
+  findAndReplace(os.path.join(destination, 'app_capabilities.js'),
+                 "'APPLICATION_CAPABILITIES'", appCapabilities)
+
   # Use a consistent extension id for dev builds.
   # AppRemoting builds always use the dev app id - the correct app id gets
   # written into the manifest later.
@@ -342,7 +349,11 @@ def buildWebApp(buildtype, version, destination, zip_path,
         'GOOGLE_API_HOSTS': googleApiHosts,
         'APP_NAME': app_name,
         'APP_DESCRIPTION': app_description,
+        'OAUTH_GDRIVE_SCOPE': '',
     }
+    if 'GOOGLE_DRIVE' in app_capabilities:
+      context['OAUTH_GDRIVE_SCOPE'] = ('https://docs.google.com/feeds/ '
+                                       'https://www.googleapis.com/auth/drive')
     processJinjaTemplate(manifest_template,
                          jinja_paths,
                          os.path.join(destination, 'manifest.json'),
@@ -361,6 +372,7 @@ def main():
            '<webapp_type> <other files...> '
            '--app_name <name> '
            '--app_description <description> '
+           '--app_capabilities <capabilities...> '
            '[--appid <appid>] '
            '[--locales <locales...>] '
            '[--jinja_paths <paths...>] '
@@ -374,6 +386,7 @@ def main():
   app_id = None
   app_name = None
   app_description = None
+  app_capabilities = set([])
   service_environment = ''
 
   for arg in sys.argv[7:]:
@@ -382,6 +395,7 @@ def main():
                '--appid',
                '--app_name',
                '--app_description',
+               '--app_capabilities',
                '--service_environment']:
       arg_type = arg
     elif arg_type == '--locales':
@@ -397,6 +411,8 @@ def main():
     elif arg_type == '--app_description':
       app_description = arg
       arg_type = ''
+    elif arg_type == '--app_capabilities':
+      app_capabilities.add(arg)
     elif arg_type == '--service_environment':
       service_environment = arg
       arg_type = ''
@@ -405,8 +421,8 @@ def main():
 
   return buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4],
                      sys.argv[5], sys.argv[6], app_id, app_name,
-                     app_description, files, locales, jinja_paths,
-                     service_environment)
+                     app_description, app_capabilities, files, locales,
+                     jinja_paths, service_environment)
 
 
 if __name__ == '__main__':

remoting/webapp/crd/js/client_session.js

@@ -31,13 +31,6 @@ var remoting = remoting || {};
  */
 remoting.ACCESS_TOKEN_RESEND_INTERVAL_MS = 15 * 60 * 1000;
 
-/**
- * True if Cast capability is supported.
- *
- * @type {boolean}
- */
-remoting.enableCast = false;
-
 /**
  * True to enable mouse lock.
  * This is currently disabled because the current client plugin does not
@@ -1677,7 +1670,8 @@ remoting.ClientSession.prototype.processCastExtensionMessage_ = function(data) {
  * @private
  */
 remoting.ClientSession.prototype.createCastExtensionHandler_ = function() {
-  if (remoting.enableCast && this.mode_ == remoting.ClientSession.Mode.ME2ME) {
+  if (remoting.app.hasCapability(remoting.ClientSession.Capability.CAST) &&
+      this.mode_ == remoting.ClientSession.Mode.ME2ME) {
     this.castExtensionHandler_ = new remoting.CastExtensionHandler(this);
   }
 };

remoting/webapp/crd/js/crd_main.js

@@ -200,7 +200,7 @@ remoting.startDesktopRemotingForTesting = function() {
 
 
 remoting.startDesktopRemoting = function() {
-  remoting.app = new remoting.Application();
+  remoting.app = new remoting.Application(remoting.app_capabilities());
   var desktop_remoting = new remoting.DesktopRemoting(remoting.app);
   remoting.app.start();
 };

remoting/webapp/crd/js/desktop_remoting.js

@@ -155,21 +155,6 @@ remoting.DesktopRemoting.prototype.getDefaultRemapKeys = function() {
   return remapKeys;
 };
 
-/**
- * @return {Array.<string>} A list of |ClientSession.Capability|s required
- *     by this application.
- */
-remoting.DesktopRemoting.prototype.getRequiredCapabilities = function() {
-  return [
-    remoting.ClientSession.Capability.SEND_INITIAL_RESOLUTION,
-    remoting.ClientSession.Capability.RATE_LIMIT_RESIZE_REQUESTS,
-    remoting.ClientSession.Capability.VIDEO_RECORDER,
-    // TODO(aiguha): Add this capability based on a gyp/command-line flag,
-    // rather than by default.
-    remoting.ClientSession.Capability.CAST
-  ];
-};
-
 /**
  * Called when a new session has been connected.
  *