Add a preference to force enable the NaCl plugin as we transition to

chrome/common/chrome_content_client.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 26 matching lines @@
 const char* kPDFPluginExtension = "pdf";
 const char* kPDFPluginDescription = "Portable Document Format";
 const char* kPDFPluginPrintPreviewMimeType
     = "application/x-google-chrome-print-preview-pdf";
 
 const char* kNaClPluginName = "Native Client";
 const char* kNaClPluginMimeType = "application/x-nacl";
 const char* kNaClPluginExtension = "nexe";
 const char* kNaClPluginDescription = "Native Client Executable";
 
+const char* kNaClOldPluginName = "Chrome NaCl";
+
 #if defined(ENABLE_REMOTING)
 const char* kRemotingViewerPluginName = "Remoting Viewer";
 const FilePath::CharType kRemotingViewerPluginPath[] =
     FILE_PATH_LITERAL("internal-remoting-viewer");
 // Use a consistent MIME-type regardless of branding.
 const char* kRemotingViewerPluginMimeType =
     "application/vnd.chromium.remoting-viewer";
 // TODO(wez): Remove the old MIME-type once client code no longer needs it.
 const char* kRemotingViewerPluginOldMimeType =
     "pepper-application/x-chromoting";
@@ skipping 203 matching lines @@
 ChangeWindowMessageFilterFunction g_ChangeWindowMessageFilter;
 
 #endif  // OS_WIN
 
 }  // namespace
 
 namespace chrome {
 
 const char* ChromeContentClient::kPDFPluginName = ::kPDFPluginName;
 const char* ChromeContentClient::kNaClPluginName = ::kNaClPluginName;
+const char* ChromeContentClient::kNaClOldPluginName = ::kNaClOldPluginName;
 
 void ChromeContentClient::SetActiveURL(const GURL& url) {
   child_process_logging::SetActiveURL(url);
 }
 
 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) {
   child_process_logging::SetGpuInfo(gpu_info);
 }
 
 void ChromeContentClient::AddPepperPlugins(
@@ skipping 108 matching lines @@
     policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
     policy->SetTokenLevel(
         sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
   }
 
   return true;
 }
 #endif
 
 }  // namespace chrome