Revert 205329 "Split pnacl and nacl mime types"

NaCl integration tests fail:
run_ppapi_bad_browser_test (scons-out/nacl-x86-64/test_results/ppapi_bad_browser_test.out) failed: Source `tests/ppapi_browser/bad/ppapi_bad_doesnotexist_nexe_only.nmf' not found, needed by target `scons-out/nacl-x86-64/test_results/ppapi_bad_browser_test.out'.


> Split pnacl and nacl mime types
> 
> Manifest parsing now knows which mime type was used, and does not allow
> pnacl to be used from nacl manifests or vice-versa.
> 
> BUG= https://code.google.com/p/nativeclient/issues/detail?id=3440
> R=bradnelson@chromium.org, jam@chromium.org, jvoung@chromium.org
> 
> Review URL: https://codereview.chromium.org/16296005

TBR=sehr@chromium.org

Review URL: https://codereview.chromium.org/15709012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205340 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 19 deletions

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 898032b..535250b 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -65,17 +65,11 @@ const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE |
                                      ppapi::PERMISSION_DEV;
 
 const char kNaClPluginMimeType[] = "application/x-nacl";
-const char kNaClPluginExtension[] = "";
+const char kNaClPluginExtension[] = "nexe";
 const char kNaClPluginDescription[] = "Native Client Executable";
 const uint32 kNaClPluginPermissions = ppapi::PERMISSION_PRIVATE |
                                       ppapi::PERMISSION_DEV;
 
-const char kPnaclPluginMimeType[] = "application/x-pnacl";
-const char kPnaclPluginExtension[] = "";
-const char kPnaclPluginDescription[] = "Portable Native Client Executable";
-const uint32 kPnaclPluginPermissions = ppapi::PERMISSION_PRIVATE |
-                                       ppapi::PERMISSION_DEV;
-
 const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator";
 const char kO3DPluginMimeType[] ="application/vnd.o3d.auto";
 const char kO3DPluginExtension[] = "";
@@ -157,12 +151,10 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
     }
   }
 
-  // Handle Native Client just like the PDF plugin. This means that it is
-  // enabled by default for the non-portable case.  This allows apps installed
-  // from the Chrome Web Store to use NaCl even if the command line switch
-  // isn't set.  For other uses of NaCl we check for the command line switch.
-  // Specifically, Portable Native Client is only enabled by the command line
-  // switch.
+  // Handle the Native Client just like the PDF plugin. This means that it is
+  // enabled by default. This allows apps installed from the Chrome Web Store
+  // to use NaCl even if the command line switch isn't set. For other uses of
+  // NaCl we check for the command line switch.
   static bool skip_nacl_file_check = false;
   if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
     if (skip_nacl_file_check || file_util::PathExists(path)) {
@@ -173,12 +165,6 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
                                                kNaClPluginExtension,
                                                kNaClPluginDescription);
       nacl.mime_types.push_back(nacl_mime_type);
-      if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)) {
-        webkit::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,
-                                                  kPnaclPluginExtension,
-                                                  kPnaclPluginDescription);
-        nacl.mime_types.push_back(pnacl_mime_type);
-      }
       nacl.permissions = kNaClPluginPermissions;
       plugins->push_back(nacl);