Remove some old support for PNaCl Scons browser tests.

ppapi/native_client/chrome_main.scons

Index: ppapi/native_client/chrome_main.scons
diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index d36bc76aac21d1758e28ec05c25b0a0f84fc6082..2a8f0ba3ca68c89b70c1f2da3c6053d8048e91cd 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -173,9 +173,6 @@ def CopyLibsForExtensionCommand(target, source, env):
     lib_info = ParseLibInfoInRunnableLdLog(line)
     if lib_info:
       lib_name, lib_path = lib_info
-      # Note: This probably does NOT work with pnacl _pexes_ right now, because
-      # the NEEDED metadata in the bitcode doesn't have the original file paths.
-      # This should probably be done without such knowledge.
       if lib_path == 'NaClMain':
         # This is a fake file name, which we cannot copy.
         continue
@@ -292,13 +289,6 @@ def GenerateManifestFunc(target, source, env):
   target_file.close()
   return 0
 
-def GenerateManifestPnacl(env, dest_file, manifest, exe_file):
-  return env.Command(
-      dest_file,
-      ['${GENNMF}', exe_file, manifest],
-      # Generate a flat url scheme to simplify file-staging.
-      ('${SOURCES[0]} ${SOURCES[1]} -L${NACL_SDK_LIB} -L${LIB_DIR} '
-       ' --flat-url-scheme --base-nmf ${SOURCES[2]} -o ${TARGET}'))
 
 def GenerateManifestDynamicLink(env, dest_file, lib_list_file,
                                 manifest, exe_file):
@@ -336,13 +326,7 @@ def GenerateSimpleManifestStaticLink(env, dest_file, exe_name):
 
 
 def GenerateSimpleManifest(env, dest_file, exe_name):
-  if env.Bit('pnacl_generate_pexe'):
-    static_manifest = GenerateSimpleManifestStaticLink(
-        env, '%s.static' % dest_file, exe_name)
-    return GenerateManifestPnacl(env, dest_file, static_manifest,
-                                 '${STAGING_DIR}/%s.pexe' %
-                                 env.ProgramNameForNmf(exe_name))
-  elif env.Bit('nacl_static_link'):
+  if env.Bit('nacl_static_link'):
     return GenerateSimpleManifestStaticLink(env, dest_file, exe_name)
   else:
     static_manifest = GenerateSimpleManifestStaticLink(
@@ -359,10 +343,7 @@ pre_base_env.AddMethod(GenerateSimpleManifest)
 def GetMainProgramFromManifest(env, manifest):
   obj = json.loads(env.File(manifest).get_contents())
   program_dict = obj['program']
-  if env.Bit('pnacl_generate_pexe') and 'portable' in program_dict:
-    return program_dict['portable']['pnacl-translate']['url']
-  else:
-    return program_dict[env.subst('${TARGET_FULLARCH}')]['url']
+  return program_dict[env.subst('${TARGET_FULLARCH}')]['url']
 
 
 # Returns scons node for generated manifest.
@@ -371,26 +352,18 @@ def GeneratedManifestNode(env, manifest):
   manifest_base_name = os.path.basename(manifest)
   main_program = GetMainProgramFromManifest(env, manifest)
   result = env.File('${STAGING_DIR}/' + manifest_base_name)
-  # Always generate the manifest for nacl_glibc and pnacl pexes.
+  # Always generate the manifest for nacl_glibc.
   # For nacl_glibc, generating the mapping of shared libraries is non-trivial.
-  # For pnacl, the manifest currently hosts a sha for the pexe.
-  if not env.Bit('nacl_glibc') and not env.Bit('pnacl_generate_pexe'):
+  if not env.Bit('nacl_glibc'):
     env.Install('${STAGING_DIR}', manifest)
     return result
-  if env.Bit('pnacl_generate_pexe'):
-    return GenerateManifestPnacl(
-        env,
-        '${STAGING_DIR}/' + manifest_base_name,
-        manifest,
-        env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
-  else:
-    return GenerateManifestDynamicLink(
-        env, '${STAGING_DIR}/' + manifest_base_name,
-        # Note that CopyLibsForExtension() and WhitelistLibsForExtension()
-        # assume that it can find the library list file under this filename.
-        GlibcManifestLibsListFilename(manifest_base_name),
-        manifest,
-        env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
+  return GenerateManifestDynamicLink(
+      env, '${STAGING_DIR}/' + manifest_base_name,
+      # Note that CopyLibsForExtension() and WhitelistLibsForExtension()
+      # assume that it can find the library list file under this filename.
+      GlibcManifestLibsListFilename(manifest_base_name),
+      manifest,
+      env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
   return result
 
 
@@ -461,10 +434,6 @@ def PPAPIBrowserTester(env,
   if browser_flags is None:
     browser_flags = []
 
-  if env.Bit('pnacl_generate_pexe'):
-    # We likely prefer to choose the 'portable' field in nmfs in this mode.
-    args = args + ['--prefer_portable_in_manifest']
-
   # Lint the extra arguments that are being passed to the tester.
   special_args = ['--ppapi_plugin', '--sel_ldr', '--irt_library', '--file',
                   '--map_file', '--extension', '--mime_type', '--tool',