Revert 180288

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 48 matching lines @@
     *enabled = iter->second;
     return true;
   }
   return false;
 }
 
 void PluginPrefs::PluginState::Set(const base::FilePath& plugin, bool enabled) {
   state_[ConvertMapKey(plugin)] = enabled;
 }
 
+void PluginPrefs::PluginState::SetIgnorePseudoKey(const base::FilePath& plugin,
+                                                  bool enabled) {
+  base::FilePath key = ConvertMapKey(plugin);
+  if (key == plugin)
+    state_[key] = enabled;
+}
+
 base::FilePath PluginPrefs::PluginState::ConvertMapKey(
     const base::FilePath& plugin) const {
   // Keep the state of component-updated and bundled Pepper Flash in sync.
   if (plugin.BaseName().value() == chrome::kPepperFlashPluginFilename) {
     base::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)) {
       base::FilePath bundled_pepper_flash;
       if (PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN,
@@ skipping 377 matching lines @@
                      base::FilePath::CompareEqualIgnoreCase(
                          path, npapi_flash.value())) {
             npapi_flash_enabled = enabled;
           } else if (migrate_to_pepper_flash &&
                      base::FilePath::CompareEqualIgnoreCase(
                          path, pepper_flash.value())) {
             if (!enabled)
               pepper_flash_node = plugin;
           }
 
-          plugin_state_.Set(plugin_path, enabled);
+          plugin_state_.SetIgnorePseudoKey(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.
@@ skipping 151 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());
 }