cleanup manifest for CRD app

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 2c694aab9cac6a569b3c5dbdefa20416abf64281..30ac60e3f4770a515efd70d616b0e28e076d4487 100644
--- a/remoting/webapp/crd/manifest.json.jinja2
+++ b/remoting/webapp/crd/manifest.json.jinja2
@@ -7,49 +7,19 @@
   "default_locale": "en",
   "minimum_chrome_version": "32",
   "app": {
-{% if webapp_type == 'v1' %}
-    "launch": {
-      "local_path": "main.html"
-    }
-{% else %}
     "background": {
       "page": "background.html"
      }
-{% endif %}
-  },
-{% if webapp_type == 'v1' %}
-  "background": {
-    "page": "background.html",
-    "persistent": false
   },
-{% endif %}
   "icons": {
     "128": "chromoting128.webp",
     "48": "chromoting48.webp",
     "16": "chromoting16.webp"
   },
-{% if webapp_type == 'v1' %}
-  "content_scripts": [
-    {
-      "matches": [
-        "{{ OAUTH2_REDIRECT_URL }}"
-      ],
-      "js": [ "cs_oauth2_trampoline.js" ]
-    },
-    {
-      "matches": [
-        "{{ THIRD_PARTY_AUTH_REDIRECT_URL }}"
-      ],
-      "js": [ "cs_third_party_auth_trampoline.js" ]
-    }
-  ],
-  "content_security_policy": "default-src 'self'; script-src 'self' {{ TALK_GADGET_HOST }} https://www.gstatic.com; style-src 'self' https://fonts.googleapis.com; img-src 'self' {{ TALK_GADGET_HOST }} data:; font-src *; connect-src 'self' {{ OAUTH2_ACCOUNTS_HOST }} {{ GOOGLE_API_HOSTS }} {{ TALK_GADGET_HOST }} https://relay.google.com",
-{% endif %}
   "optional_permissions": [
     "<all_urls>"
   ],
 
-{% if webapp_type != 'v1' %}
   "oauth2": {
     "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
     "scopes": [
@@ -64,7 +34,6 @@
   "sandbox": {
     "pages": [ "wcs_sandbox.html" ]
   },
-{% endif %}
   "permissions": [
     "{{ OAUTH2_ACCOUNTS_HOST }}/*",
     "{{ OAUTH2_API_BASE_URL }}/*",
@@ -75,21 +44,17 @@
 {% if PROXY_URL != '' %}
     "{{ PROXY_URL }}",
 {% endif %}
-    "storage",
     "clipboardRead",
     "clipboardWrite",
-    "metricsPrivate",
-    "nativeMessaging"
-{% if webapp_type != 'v1' %}
-    ,
+    "contextMenus",
     {"fileSystem": ["write"]},
     "fullscreen",
     "identity",
-    "contextMenus",
-    "overrideEscFullscreen"
-{% endif %}
-{% if webapp_type != 'v1' %}
-    ,{
+    "metricsPrivate",
+    "nativeMessaging",
+    "overrideEscFullscreen",
+    "storage",
+    {
       "socket": [
         "udp-send-to",
         "udp-bind",
@@ -98,13 +63,10 @@
         "network-state"
       ]
     }
-{% endif %}
-  ]
-{% if webapp_type != 'v1' %}
-  ,"sockets": {
+  ],
+  "sockets": {
     "tcp": {
       "connect": "{{ XMPP_SERVER }}"
     }
   }
-{% endif %}
 }