Remove disable-pnacl flag.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index c49da3c3b6f7019c901da3b18b7da5b7c6d87969..6832b764898569c0915e6fccc52601fe3dbd8b27 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -680,14 +680,10 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             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;