Altered the logic that determines when NaCl is enabled. Previously, we requi...

chrome/renderer/render_process_impl.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 166 matching lines @@
 
   if (command_line.HasSwitch(switches::kEnableWatchdog)) {
     // TODO(JAR): Need to implement renderer IO msgloop watchdog.
   }
 
   if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     StatisticsRecorder::set_dump_on_exit(true);
   }
 
 #ifndef DISABLE_NACL
-  if (command_line.HasSwitch(switches::kInternalNaCl)) {
-    std::map<std::string, uintptr_t> funcs;
-    funcs["launch_nacl_process"] =
-      reinterpret_cast<uintptr_t>(LaunchNaClProcess);
-    funcs["launch_nacl_process_multi_fd"] =
-      reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD);
-    RegisterInternalNaClPlugin(funcs);
-  }
+  std::map<std::string, uintptr_t> funcs;
+  funcs["launch_nacl_process"] =
+    reinterpret_cast<uintptr_t>(LaunchNaClProcess);
+  funcs["launch_nacl_process_multi_fd"] =
+    reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD);
+  RegisterInternalNaClPlugin(funcs);
 #endif
 
   if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) {
     webkit_glue::SetMediaCacheEnabled(true);
   }
 
 #if defined(OS_MACOSX)
   FilePath bundle_path = mac_util::MainAppBundlePath();
 
   initialized_media_library_ =
@@ skipping 184 matching lines @@
 }
 
 void RenderProcessImpl::ClearTransportDIBCache() {
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
     if (shared_mem_cache_[i]) {
       FreeTransportDIB(shared_mem_cache_[i]);
       shared_mem_cache_[i] = NULL;
     }
   }
 }