Cause the 'enable-nacl' flag to be locked with enabling the NaCl plugin.

chrome/browser/about_flags.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/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace about_flags {
 
 // Macros to simplify specifying the type.
 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
@@ skipping 140 matching lines @@
   // Only expose this for Chromium builds where users may not have the PDF
   // plugin. Do not give Google Chrome users the option to disable it here.
   {
     "print-preview",  // FLAGS:RECORD_UMA
     IDS_FLAGS_PRINT_PREVIEW_NAME,
     IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux,  // This switch is not available in CrOS.
     SINGLE_VALUE_TYPE(switches::kEnablePrintPreview)
   },
 #endif
+  // TODO(dspringer): When NaCl is on by default, remove this flag entry.
   {
-    "enable-nacl",  // FLAGS:RECORD_UMA
+    switches::kEnableNaCl,  // FLAGS:RECORD_UMA
     IDS_FLAGS_ENABLE_NACL_NAME,
     IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableNaCl)
   },
   {
     "dns-server",  // FLAGS:RECORD_UMA
     IDS_FLAGS_DNS_SERVER_NAME,
     IDS_FLAGS_DNS_SERVER_DESCRIPTION,
     kOsLinux,
@@ skipping 489 matching lines @@
   const Experiment* e = NULL;
   for (size_t i = 0; i < num_experiments; ++i) {
     if (experiments[i].internal_name == internal_name) {
       e = experiments + i;
       break;
     }
   }
   DCHECK(e);
 
   if (e->type == Experiment::SINGLE_VALUE) {
-    if (enable)
+    if (enable) {
       enabled_experiments.insert(internal_name);
-    else
+      // If enabling NaCl, make sure the plugin is also enabled. See bug
+      // http://code.google.com/p/chromium/issues/detail?id=81010 for more
+      // information.
+      // TODO(dspringer): When NaCl is on by default, remove this code.
+      if (internal_name == switches::kEnableNaCl) {
+        PluginUpdater* plugin_updater = PluginUpdater::GetInstance();
+        string16 nacl_plugin_name =
+            ASCIIToUTF16(chrome::ChromeContentClient::kNaClPluginName);
+        plugin_updater->EnablePluginGroup(true, nacl_plugin_name);
+      }
+    } else {
       enabled_experiments.erase(internal_name);
+    }
   } else {
     if (enable) {
       // Enable the first choice.
       enabled_experiments.insert(NameForChoice(*e, 0));
     } else {
       // Find the currently enabled choice and disable it.
       for (int i = 0; i < e->num_choices; ++i) {
         std::string choice_name = NameForChoice(*e, i);
         if (enabled_experiments.find(choice_name) !=
             enabled_experiments.end()) {
@@ skipping 44 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags