Use PNaCl in V2 builds of the remoting webapp

remoting/remoting_webapp.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.
 #
 # File included in remoting_webapp_* targets in remoting_client.gypi
 
 {
   'type': 'none',
   'variables': {
     'extra_files%': [],
     'generated_html_files': [
       '<(SHARED_INTERMEDIATE_DIR)/main.html',
       '<(SHARED_INTERMEDIATE_DIR)/wcs_sandbox.html',
     ],
   },
   'dependencies': [
     'remoting_resources',
     'remoting_webapp_html',
   ],
   'conditions': [
-    ['webapp_type=="v2_pnacl"', {
+    ['webapp_type=="v2"', {
       'dependencies': [
         'remoting_nacl.gyp:remoting_client_plugin_nacl',
       ],
       'variables': {
         'extra_files': [
+          'webapp/background.js',
           'webapp/remoting_client_pnacl.nmf',
           '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
         ],
       },
     }],
     ['run_jscompile != 0', {
       'variables': {
         'success_stamp': '<(PRODUCT_DIR)/remoting_webapp_jscompile.stamp',
       },
       'actions': [
@@ skipping 42 matching lines @@
         'webapp/manifest.json.jinja2',
         '<(webapp_type)',
         '<@(generated_html_files)',
         '<@(remoting_webapp_files)',
         '<@(extra_files)',
         '--locales', '<@(remoting_webapp_locale_files)',
       ],
     },
   ],
 }