Remove disable-pnacl flag.

chrome/renderer/chrome_content_renderer_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/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 662 matching lines @@
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kAllowed: {
         const bool is_nacl_plugin =
             plugin.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName);
         const bool is_nacl_mime_type =
             actual_mime_type == "application/x-nacl";
         const bool is_pnacl_mime_type =
             actual_mime_type == "application/x-pnacl";
         if (is_nacl_plugin || is_nacl_mime_type || is_pnacl_mime_type) {
           bool is_nacl_unrestricted = false;
-          if (is_nacl_mime_type) {
+          if (is_nacl_mime_type || is_pnacl_mime_type) {

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

I don't think this preserves the original's meaning.

Only one of the mime types should be set at a time. If is_pnacl_mime_type is
true, then is_nacl_unrestricted is just plain true (it's not dependent on the
kEnableNaCl).

Let me know if I'm reading this wrong, since this seems pretty important to get
right!

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

You're right, thanks for catching that.

             is_nacl_unrestricted =
                 CommandLine::ForCurrentProcess()->HasSwitch(
                     switches::kEnableNaCl);
-          } else if (is_pnacl_mime_type) {
-            is_nacl_unrestricted =
-                !CommandLine::ForCurrentProcess()->HasSwitch(
-                    switches::kDisablePnacl);
           }
           GURL manifest_url;
           GURL app_url;
           if (is_nacl_mime_type || is_pnacl_mime_type) {
             // Normal NaCl/PNaCl embed. The app URL is the page URL.
             manifest_url = url;
             app_url = frame->top()->document().url();
           } else {
             // NaCl is being invoked as a content handler. Look up the NaCl
             // module using the MIME type. The app URL is the manifest URL.
@@ skipping 798 matching lines @@
 
   if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
     return true;
 
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   return channel <= chrome::VersionInfo::CHANNEL_DEV;
 #else
   return false;
 #endif
 }