Policy: Re-enabled plugin still disabled

webkit/plugins/npapi/plugin_list_win.cc

Index: webkit/plugins/npapi/plugin_list_win.cc
diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc
index 324dffb03efdf64c510745ceea1cd366da78dde8..5d479fe46d72df642990206d9e32524ea60129e1 100644
--- a/webkit/plugins/npapi/plugin_list_win.cc
+++ b/webkit/plugins/npapi/plugin_list_win.cc
@@ -275,9 +275,8 @@ void PluginList::LoadPluginsFromDir(const FilePath &path,
   FindClose(find_handle);
 }
 
-void PluginList::LoadPluginsFromRegistry(
-    std::vector<WebPluginInfo>* plugins,
-    std::set<FilePath>* visited_plugins) {
+void PluginList::LoadPluginsFromRegistry(std::vector<WebPluginInfo>* plugins,
+                                         std::set<FilePath>* visited_plugins) {
   std::set<FilePath> plugin_dirs;
 
   GetPluginsInRegistryDirectory(
@@ -340,13 +339,13 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
 
   for (size_t i = 0; i < plugins->size(); ++i) {
     std::wstring plugin1 =
-        StringToLowerASCII((*plugins)[i].path.BaseName().ToWStringHack());
+        StringToLowerASCII(plugins->at(i).path.BaseName().ToWStringHack());

[jam, 2011/01/19 20:22:09]

ditto for this file, it doesn't look like any changes are necessary here.

[pastarmovj, 2011/01/19 23:39:17]

Done.

     std::wstring plugin2 =
         StringToLowerASCII(info.path.BaseName().ToWStringHack());
-    if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[i], info)) ||
+    if ((plugin1 == plugin2 && HaveSharedMimeType(plugins->at(i), info)) ||
         (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
         (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
-      if (!IsNewerVersion((*plugins)[i].version, info.version))
+      if (!IsNewerVersion(plugins->at(i).version, info.version))
         return false;  // We have loaded a plugin whose version is newer.
 
       plugins->erase(plugins->begin() + i);
@@ -397,14 +396,14 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
       return false;
 
     for (size_t i = 0; i < plugins->size(); ++i) {
-      if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
+      if (plugins->at(i).path.BaseName().value() == kOldWMPPlugin) {
         plugins->erase(plugins->begin() + i);
         break;
       }
     }
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugins->size(); ++i) {
-      if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
+      if (plugins->at(i).path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }