Fix two bugs for setting the pdf plugin on by default:...

chrome/browser/plugin_updater.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 "chrome/browser/plugin_updater.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 73 matching lines @@
 }
 
 void EnablePluginFile(bool enable, const FilePath::StringType& path) {
   FilePath file_path(path);
   if (enable && !PluginGroup::IsPluginPathDisabledByPolicy(file_path))
     NPAPI::PluginList::Singleton()->EnablePlugin(file_path);
   else
     NPAPI::PluginList::Singleton()->DisablePlugin(file_path);
 }
 
+// Note: if you change this to false from true, you must update
+// kPluginsEnabledInternalPDF to be a new name (i.e. add 2, 3, 4...) at end.
 static bool enable_internal_pdf_ = true;
 
 void DisablePluginGroupsFromPrefs(Profile* profile) {
   bool update_internal_dir = false;
+  bool update_preferences = false;
   FilePath last_internal_dir =
   profile->GetPrefs()->GetFilePath(prefs::kPluginsLastInternalDirectory);
   FilePath cur_internal_dir;
   if (PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &cur_internal_dir) &&
       cur_internal_dir != last_internal_dir) {
     update_internal_dir = true;
     profile->GetPrefs()->SetFilePath(
         prefs::kPluginsLastInternalDirectory, cur_internal_dir);
   }
 
+  if (!enable_internal_pdf_) {
+    // This DCHECK guards against us disabling/enabling the pdf plugin more than
+    // once without renaming the flag that tells us whether we can enable it
+    // automatically.  Each time we disable the plugin by default after it was
+    // enabled by default, we need to rename that flag.
+    DCHECK(!profile->GetPrefs()->GetBoolean(prefs::kPluginsEnabledInternalPDF));
+  }
+
   bool found_internal_pdf = false;
   bool force_enable_internal_pdf = false;
+  string16 pdf_group_name;
   FilePath pdf_path;
   PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
   FilePath::StringType pdf_path_str = pdf_path.value();
   if (enable_internal_pdf_ &&
       !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;
@@ skipping 25 matching lines @@
                 last_internal_dir.value()) == 0) {
           // If the internal plugin directory has changed and if the plugin
           // looks internal, update its path in the prefs.
           plugin_path = cur_internal_dir.Append(plugin_path.BaseName());
           path = plugin_path.value();
           plugin->SetString("path", path);
         }
 
         if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) {
           found_internal_pdf = true;
+          plugin->GetString("name", &pdf_group_name);
           if (!enabled && force_enable_internal_pdf) {
             enabled = true;
             plugin->SetBoolean("enabled", true);
+            update_preferences = true;  // Can't modify the list during looping.
           }
         }
         if (!enabled)
           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.
+        if (force_enable_internal_pdf && pdf_group_name == group_name)
+          continue;
+
         // Otherwise this is a list of groups.
         EnablePluginGroup(false, group_name);
       }
     }
   }
 
   // Build the set of policy-disabled plugins once and cache it.
   // Don't do this in the constructor, there's no profile available there.
   std::set<string16> policy_disabled_plugins;
   const ListValue* plugin_blacklist =
@@ skipping 27 matching lines @@
     string16 current_group_name = (*it)->GetGroupName();
     if (PluginGroup::IsPluginNameDisabledByPolicy(current_group_name))
       EnablePluginGroup(false, current_group_name);
   }
 
   if (!enable_internal_pdf_ && !found_internal_pdf) {
     // The internal PDF plugin is disabled by default, and the user hasn't
     // overridden the default.
     NPAPI::PluginList::Singleton()->DisablePlugin(pdf_path);
   }
+
+  if (update_preferences)
+    UpdatePreferences(profile);
 }
 
 void DisableOutdatedPluginGroups() {
   std::vector<linked_ptr<PluginGroup> > groups;
   GetPluginGroups(&groups);
   for (std::vector<linked_ptr<PluginGroup> >::iterator it =
        groups.begin();
        it != groups.end();
        ++it) {
     (*it)->DisableOutdatedPlugins();
@@ skipping 29 matching lines @@
     // Don't save preferences for vulnerable pugins.
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableOutdatedPlugins) ||
         !(*it)->IsVulnerable()) {
       plugins_list->Append((*it)->GetSummary());
     }
   }
 }
 
 }  // namespace plugin_updater