Use PNaCl in V2 builds of the remoting webapp

remoting/webapp/build-webapp.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Creates a directory with with the unpacked contents of the remoting webapp.
 
 The directory will contain a copy-of or a link-to to all remoting webapp
 resources.  This includes HTML/JS and any plugin binaries. The script also
 massages resulting files appropriately with host plugin data. Finally,
@@ skipping 68 matching lines @@
                 manifest_template, webapp_type, files, locales):
   """Does the main work of building the webapp directory and zipfile.
 
   Args:
     buildtype: the type of build ("Official" or "Dev").
     destination: A string with path to directory where the webapp will be
                  written.
     zipfile: A string with path to the zipfile to create containing the
              contents of |destination|.
     manifest_template: jinja2 template file for manifest.
-    webapp_type: webapp type ("v1", "v2" or "v2_pnacl").
+    webapp_type: webapp type ("v1" or "v2").
     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
              with their directory structure from the _locales directory down.
   """
   # Ensure a fresh directory.
   try:
     shutil.rmtree(destination)
   except OSError:
     if os.path.exists(destination):
@@ skipping 43 matching lines @@
       os.mkdir(destination_dir, 0775)
       shutil.copy2(current_locale, destination_file)
     elif extension == '.pak':
       destination_file = os.path.join(remoting_locales,
                                       os.path.split(current_locale)[1])
       shutil.copy2(current_locale, destination_file)
     else:
       raise Exception("Unknown extension: " + current_locale);
 
   # Set client plugin type.
-  client_plugin = 'pnacl' if webapp_type == 'v2_pnacl' else 'native'
+  client_plugin = 'pnacl' if webapp_type == 'v2' else 'native'
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'CLIENT_PLUGIN_TYPE'", "'" + client_plugin + "'")
 
   # Allow host names for google services/apis to be overriden via env vars.
   oauth2AccountsHost = os.environ.get(
       'OAUTH2_ACCOUNTS_HOST', 'https://accounts.google.com')
   oauth2ApiHost = os.environ.get(
       'OAUTH2_API_HOST', 'https://www.googleapis.com')
   directoryApiHost = os.environ.get(
       'DIRECTORY_API_HOST', 'https://www.googleapis.com')
@@ skipping 115 matching lines @@
       locales.append(arg)
     else:
       files.append(arg)
 
   return buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4],
                      sys.argv[5], sys.argv[6], files, locales)
 
 
 if __name__ == '__main__':
   sys.exit(main())