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

chrome/browser/plugin_updater.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/plugin_updater.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 137 matching lines @@
   PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
   FilePath::StringType pdf_path_str = pdf_path.value();
   if (!profile->GetPrefs()->GetBoolean(prefs::kPluginsEnabledInternalPDF)) {
     // We switched to the internal pdf plugin being on by default, and so we
     // need to force it to be enabled.  We only want to do it this once though,
     // i.e. we don't want to enable it again if the user disables it afterwards.
     profile->GetPrefs()->SetBoolean(prefs::kPluginsEnabledInternalPDF, true);
     force_enable_internal_pdf = true;
   }
 
+  bool force_enable_nacl = false;
+  string16 nacl_group_name =
+      ASCIIToUTF16(chrome::ChromeContentClient::kNaClPluginName);
+  // Since the NaCl Plugin changed names between Chrome 13 and 14, we need to
+  // check for both because either could be stored as the plugin group name.
+  string16 old_nacl_group_name =
+      ASCIIToUTF16(chrome::ChromeContentClient::kNaClOldPluginName);
+  FilePath nacl_path;
+  PathService::Get(chrome::FILE_NACL_PLUGIN, &nacl_path);
+  FilePath::StringType nacl_path_str = nacl_path.value();
+  if (!profile->GetPrefs()->GetBoolean(prefs::kPluginsEnabledNaCl)) {
+    // We switched to the nacl plugin being on by default, and so we need to
+    // force it to be enabled.  We only want to do it this once though, i.e.
+    // we don't want to enable it again if the user disables it afterwards.
+    profile->GetPrefs()->SetBoolean(prefs::kPluginsEnabledNaCl, true);
+    force_enable_nacl = true;
+  }
+
   {  // Scoped update of prefs::kPluginsPluginsList.
     ListPrefUpdate update(profile->GetPrefs(), prefs::kPluginsPluginsList);
     ListValue* saved_plugins_list = update.Get();
     if (saved_plugins_list && !saved_plugins_list->empty()) {
       for (ListValue::const_iterator it = saved_plugins_list->begin();
            it != saved_plugins_list->end();
            ++it) {
         if (!(*it)->IsType(Value::TYPE_DICTIONARY)) {
           LOG(WARNING) << "Invalid entry in " << prefs::kPluginsPluginsList;
           continue;  // Oops, don't know what to do with this item.
@@ skipping 21 matching lines @@
             plugin->SetString("path", path);
           }
 
           if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) {
             if (!enabled && force_enable_internal_pdf) {
               enabled = true;
               plugin->SetBoolean("enabled", true);
             }
 
             internal_pdf_enabled = enabled;
+          } else if (FilePath::CompareIgnoreCase(path, nacl_path_str) == 0) {
+            if (!enabled && force_enable_nacl) {
+              enabled = true;
+              plugin->SetBoolean("enabled", true);
+            }
           }
 
           if (!enabled)
             webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_path);
         } else if (!enabled && plugin->GetString("name", &group_name)) {
-          // Don't disable this group if it's for the pdf plugin and we just
-          // forced it on.
+          // Don't disable this group if it's for the pdf or nacl plugins and
+          // we just forced it on.
           if (force_enable_internal_pdf && pdf_group_name == group_name)
             continue;
+          if (force_enable_nacl && (nacl_group_name == group_name ||
+                                    old_nacl_group_name == group_name))
+            continue;
 
           // Otherwise this is a list of groups.
           EnablePluginGroup(false, group_name);
         }
       }
     } else {
       // If the saved plugin list is empty, then the call to UpdatePreferences()
       // below failed in an earlier run, possibly because the user closed the
-      // browser too quickly. Try to force enable the internal PDF plugin again.
+      // browser too quickly. Try to force enable the internal PDF and nacl
+      // plugins again.
       force_enable_internal_pdf = true;
+      force_enable_nacl = true;
     }
   }  // Scoped update of prefs::kPluginsPluginsList.
 
   // Build the set of policy enabled/disabled plugin patterns once and cache it.
   // Don't do this in the constructor, there's no profile available there.
   const ListValue* disabled_plugins =
       profile->GetPrefs()->GetList(prefs::kPluginsDisabledPlugins);
   const ListValue* disabled_exception_plugins =
       profile->GetPrefs()->GetList(prefs::kPluginsDisabledPluginsExceptions);
   const ListValue* enabled_plugins =
       profile->GetPrefs()->GetList(prefs::kPluginsEnabledPlugins);
   UpdatePluginsStateFromPolicy(disabled_plugins,
                                disabled_exception_plugins,
                                enabled_plugins);
 
   registrar_.RemoveAll();
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kPluginsDisabledPlugins, this);
   registrar_.Add(prefs::kPluginsDisabledPluginsExceptions, this);
   registrar_.Add(prefs::kPluginsEnabledPlugins, this);
 
   if (force_enable_internal_pdf || internal_pdf_enabled) {
     // See http://crbug.com/50105 for background.
     EnablePluginGroup(false, ASCIIToUTF16(
         webkit::npapi::PluginGroup::kAdobeReaderGroupName));
   }
 
-  if (force_enable_internal_pdf) {
+  if (force_enable_internal_pdf || force_enable_nacl) {
     // We want to save this, but doing so requires loading the list of plugins,
     // so do it after a minute as to not impact startup performance.  Note that
     // plugins are loaded after 30s by the metrics service.
     UpdatePreferences(profile, kPluginUpdateDelayMs);
   }
 }
 
 void PluginUpdater::Shutdown() {
   registrar_.RemoveAll();
 }
@@ skipping 90 matching lines @@
   prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
                               internal_dir,
                               PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
                           PrefService::UNSYNCABLE_PREF);
 }