Remove disable-pnacl flag.

chrome/common/chrome_content_client.cc

 // 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.
 
 #include "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/debug/crash_logging.h"
 #include "base/file_util.h"
@@ skipping 151 matching lines @@
       plugins->push_back(pdf);
 
       skip_pdf_file_check = true;
     }
   }
 
   // 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

[jvoung (off chromium), 2014/07/15 22:04:16]

Can remove this old comment about PNaCl being only enabled by the command line
switch.

[teravest, 2014/07/15 23:08:51]

Done.

   // switch.
   static bool skip_nacl_file_check = false;
   if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
     if (skip_nacl_file_check || base::PathExists(path)) {

[jvoung (off chromium), 2014/07/15 22:04:16]

It seems like we need to be careful about registering the mime_type once the
trusted plugin is gone.

The PathExists() check seems to serve as detecting if the gyp_defines did/did
not compile in NaCl support.

[teravest, 2014/07/15 23:08:51]

I'd expect the behavior for registering the nacl mime type to be the same as the
pnacl mime type. Is there something I'm misunderstanding?

[jvoung (off chromium), 2014/07/15 23:24:15]

You're right that registering the nacl mime type should be the same as
registering the pnacl mime type. I think this code is fine as is.

I'm just saying that when there isn't a "FILE_NACL_PLUGIN", the code might have
be more careful and check #ifdef DISABLE_NACL or something.

[teravest, 2014/07/16 01:38:46]

Ah, okay.

       content::PepperPluginInfo nacl;
       nacl.path = path;
       nacl.name = ChromeContentClient::kNaClPluginName;
       content::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
                                                 kNaClPluginExtension,
                                                 kNaClPluginDescription);
       nacl.mime_types.push_back(nacl_mime_type);
-      if (!CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisablePnacl)) {
-        content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,
-                                                   kPnaclPluginExtension,
-                                                   kPnaclPluginDescription);
-        nacl.mime_types.push_back(pnacl_mime_type);
-      }
+      content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,
+                                                 kPnaclPluginExtension,
+                                                 kPnaclPluginDescription);
+      nacl.mime_types.push_back(pnacl_mime_type);
       nacl.permissions = kNaClPluginPermissions;
       plugins->push_back(nacl);
 
       skip_nacl_file_check = true;
     }
   }
 
   static bool skip_o1d_file_check = false;
   if (PathService::Get(chrome::FILE_O1D_PLUGIN, &path)) {
     if (skip_o1d_file_check || base::PathExists(path)) {
@@ skipping 331 matching lines @@
     int sandbox_type,
     int* sandbox_profile_resource_id) const {
   DCHECK(sandbox_profile_resource_id);
   if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
     *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
     return true;
   }
   return false;
 }
 #endif