Merge 185431 - Ignore the disabled state of component-updated PPAPI Flash for once.

chrome/browser/plugins/plugin_prefs.cc

 // Copyright (c) 2012 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/plugins/plugin_prefs.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 
 using content::BrowserThread;
 using content::PluginService;
 
 namespace {
 
 // How long to wait to save the plugin enabled information, which might need to
 // go to disk.
 const int64 kPluginUpdateDelayMs = 60 * 1000;
 
+bool IsComponentUpdatedPepperFlash(const FilePath& plugin) {
+  if (plugin.BaseName().value() == chrome::kPepperFlashPluginFilename) {
+    FilePath component_updated_pepper_flash_dir;
+    if (PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN,
+                         &component_updated_pepper_flash_dir) &&
+        component_updated_pepper_flash_dir.IsParent(plugin)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 }  // namespace
 
 PluginPrefs::PluginState::PluginState() {
 }
 
 PluginPrefs::PluginState::~PluginState() {
 }
 
 bool PluginPrefs::PluginState::Get(const FilePath& plugin,
                                    bool* enabled) const {
   FilePath key = ConvertMapKey(plugin);
   std::map<FilePath, bool>::const_iterator iter = state_.find(key);
   if (iter != state_.end()) {
     *enabled = iter->second;
     return true;
   }
   return false;
 }
 
 void PluginPrefs::PluginState::Set(const FilePath& plugin, bool enabled) {
   state_[ConvertMapKey(plugin)] = enabled;
 }
 
 FilePath PluginPrefs::PluginState::ConvertMapKey(const FilePath& plugin) const {
   // Keep the state of component-updated and bundled Pepper Flash in sync.
-  if (plugin.BaseName().value() == chrome::kPepperFlashPluginFilename) {
-    FilePath component_updated_pepper_flash_dir;
-    if (PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN,
-                         &component_updated_pepper_flash_dir) &&
-        component_updated_pepper_flash_dir.IsParent(plugin)) {
-      FilePath bundled_pepper_flash;
-      if (PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN,
-                           &bundled_pepper_flash)) {
-        return bundled_pepper_flash;
-      }
+  if (IsComponentUpdatedPepperFlash(plugin)) {
+    FilePath bundled_pepper_flash;
+    if (PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN,
+                         &bundled_pepper_flash)) {
+      return bundled_pepper_flash;
     }
   }
 
   return plugin;
 }
 
 // static
 scoped_refptr<PluginPrefs> PluginPrefs::GetForProfile(Profile* profile) {
   return PluginPrefsFactory::GetPrefsForProfile(profile);
 }
@@ skipping 254 matching lines @@
   if (!prefs_->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.
     prefs_->SetBoolean(prefs::kPluginsEnabledNaCl, true);
     force_enable_nacl = true;
   }
 
   bool migrate_to_pepper_flash = false;
 #if defined(OS_WIN) || defined(OS_MACOSX)
-  // If bundled NPAPI Flash is enabled while Peppper Flash is disabled, we
+  // If bundled NPAPI Flash is enabled while Pepper Flash is disabled, we
   // would like to turn Pepper Flash on. And we only want to do it once.
   // TODO(yzshen): Remove all |migrate_to_pepper_flash|-related code after it
   // has been run once by most users. (Maybe Chrome 24 or Chrome 25.)
   // NOTE(shess): Keep in mind that Mac is on a different schedule.
   if (!prefs_->GetBoolean(prefs::kPluginsMigratedToPepperFlash)) {
     prefs_->SetBoolean(prefs::kPluginsMigratedToPepperFlash, true);
     migrate_to_pepper_flash = true;
   }
 #endif
 
+  bool remove_component_pepper_flash_settings = false;
+  // If component-updated Pepper Flash is disabled, we would like to remove that
+  // settings item. And we only want to do it once. (Please see the comments of
+  // kPluginsRemovedOldComponentPepperFlashSettings for why.)
+  // TODO(yzshen): Remove all |remove_component_pepper_flash_settings|-related
+  // code after it has been run once by most users.
+  if (!prefs_->GetBoolean(
+          prefs::kPluginsRemovedOldComponentPepperFlashSettings)) {
+    prefs_->SetBoolean(prefs::kPluginsRemovedOldComponentPepperFlashSettings,
+                       true);
+    remove_component_pepper_flash_settings = true;
+  }
+
   {  // Scoped update of prefs::kPluginsPluginsList.
     ListPrefUpdate update(prefs_, prefs::kPluginsPluginsList);
     ListValue* saved_plugins_list = update.Get();
     if (saved_plugins_list && !saved_plugins_list->empty()) {
       // The following four variables are only valid when
       // |migrate_to_pepper_flash| is set to true.
       FilePath npapi_flash;
       FilePath pepper_flash;
       DictionaryValue* pepper_flash_node = NULL;
       bool npapi_flash_enabled = false;
       if (migrate_to_pepper_flash) {
         PathService::Get(chrome::FILE_FLASH_PLUGIN, &npapi_flash);
         PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &pepper_flash);
       }
 
-      for (ListValue::const_iterator it = saved_plugins_list->begin();
+      // Used when |remove_component_pepper_flash_settings| is set to true.
+      ListValue::iterator component_pepper_flash_node =
+          saved_plugins_list->end();
+
+      for (ListValue::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.
         }
 
         DictionaryValue* plugin = static_cast<DictionaryValue*>(*it);
         string16 group_name;
         bool enabled;
@@ skipping 58 matching lines @@
               enabled = true;
               plugin->SetBoolean("enabled", true);
             }
           } else if (migrate_to_pepper_flash &&
               FilePath::CompareEqualIgnoreCase(path, npapi_flash.value())) {
             npapi_flash_enabled = enabled;
           } else if (migrate_to_pepper_flash &&
               FilePath::CompareEqualIgnoreCase(path, pepper_flash.value())) {
             if (!enabled)
               pepper_flash_node = plugin;
+          } else if (remove_component_pepper_flash_settings &&
+                     IsComponentUpdatedPepperFlash(plugin_path)) {
+            if (!enabled) {
+              component_pepper_flash_node = it;
+              // Skip setting |enabled| into |plugin_state_|.
+              continue;
+            }
           }
 
           plugin_state_.Set(plugin_path, enabled);
         } else if (!enabled && plugin->GetString("name", &group_name)) {
           // 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.
           plugin_group_state_[group_name] = false;
         }
       }
 
       if (npapi_flash_enabled && pepper_flash_node) {
         DCHECK(migrate_to_pepper_flash);
         pepper_flash_node->SetBoolean("enabled", true);
         plugin_state_.Set(pepper_flash, true);
       }
+
+      if (component_pepper_flash_node != saved_plugins_list->end()) {
+        DCHECK(remove_component_pepper_flash_settings);
+        saved_plugins_list->Erase(component_pepper_flash_node, NULL);
+      }
     } 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 and nacl
       // plugins again.
       force_enable_internal_pdf = true;
       force_enable_nacl = true;
     }
   }  // Scoped update of prefs::kPluginsPluginsList.
 
@@ skipping 132 matching lines @@
   }
 }
 
 void PluginPrefs::NotifyPluginStatusChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }