Added support for enabling GCD, or not, at build time.

remoting/webapp/crd/manifest.json.jinja2

Index: remoting/webapp/crd/manifest.json.jinja2
diff --git a/remoting/webapp/crd/manifest.json.jinja2 b/remoting/webapp/crd/manifest.json.jinja2
index 8f0f59cf154695111d4f5dd0f5f44b533c3721fc..3f2b0b20ef7dd9398c53c1ca25a11cadcbc5ef90 100644
--- a/remoting/webapp/crd/manifest.json.jinja2
+++ b/remoting/webapp/crd/manifest.json.jinja2
@@ -53,7 +53,12 @@
   "oauth2": {
     "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
     "scopes": [
-      "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
+      {%- if USE_GCD %}

[Sergey Ulanov, 2015/03/25 18:56:43]

We don't use "%-" in other places in this file and I think it's better to keep
it consistent. Please either add '-' for other jinja statements in this file or
remove it here.

[John Williams, 2015/03/25 20:32:20]

Done.

+      "https://www.googleapis.com/auth/clouddevices",
+      {%- endif %}
+      "https://www.googleapis.com/auth/chromoting",
+      "https://www.googleapis.com/auth/googletalk",
+      "https://www.googleapis.com/auth/userinfo#email"
     ]
   },
   "sandbox": {