Policy: Re-enabled plugin still disabled

webkit/glue/plugins/plugin_list_win.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 "webkit/glue/plugins/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
@@ skipping 252 matching lines @@
       FilePath filename = path.Append(find_file_data.cFileName);
       LoadPlugin(filename, plugins);
       visited_plugins->insert(filename);
     }
   } while (FindNextFile(find_handle, &find_file_data) != 0);
 
   DCHECK(GetLastError() == ERROR_NO_MORE_FILES);
   FindClose(find_handle);
 }
 
-void PluginList::LoadPluginsFromRegistry(
-    std::vector<WebPluginInfo>* plugins,
-    std::set<FilePath>* visited_plugins) {
+void PluginList::LoadPluginsFromRegistry(std::set<FilePath>* visited_plugins,
+                                         std::vector<WebPluginInfo>* plugins) {
   std::set<FilePath> plugin_dirs;
 
   GetPluginsInRegistryDirectory(
       HKEY_CURRENT_USER, kRegistryMozillaPlugins, &plugin_dirs);
   GetPluginsInRegistryDirectory(
       HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, &plugin_dirs);
 
   for (std::set<FilePath>::iterator i = plugin_dirs.begin();
        i != plugin_dirs.end(); ++i) {
     LoadPlugin(*i, plugins);
@@ skipping 40 matching lines @@
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   std::vector<WebPluginInfo>* plugins) {
   // Version check
 
-  for (size_t i = 0; i < plugins->size(); ++i) {
+  for (std::vector<WebPluginInfo>::iterator it = plugins->begin();

[jam, 2010/12/17 19:14:45]

please leave as before

[pastarmovj, 2010/12/20 19:57:37]

Done.

+       it != plugins->end();
+       ++it) {
     std::wstring plugin1 =
-        StringToLowerASCII((*plugins)[i].path.BaseName().ToWStringHack());
+        StringToLowerASCII(it->path.BaseName().ToWStringHack());
     std::wstring plugin2 =
         StringToLowerASCII(info.path.BaseName().ToWStringHack());
-    if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[i], info)) ||
+    if ((plugin1 == plugin2 && HaveSharedMimeType(*it, info)) ||
         (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
         (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
-      if (!IsNewerVersion((*plugins)[i].version, info.version))
+      if (!IsNewerVersion(it->version, info.version))
         return false;  // We have loaded a plugin whose version is newer.
 
-      plugins->erase(plugins->begin() + i);
+      // TODO(pastarmovj): We can't just remove it like that. We could possibly
+      // disable it first.
+      plugins->erase(it);
       break;
     }
   }
 
   // Troublemakers
 
   std::wstring filename = StringToLowerASCII(info.path.BaseName().value());
   // Depends on XPCOM.
   if (filename == kMozillaActiveXPlugin)
     return false;
@@ skipping 26 matching lines @@
     }
   }
 
   // Special WMP handling
 
   // If both the new and old WMP plugins exist, only load the new one.
   if (filename == kNewWMPPlugin) {
     if (dont_load_new_wmp_)
       return false;
 
-    for (size_t i = 0; i < plugins->size(); ++i) {
-      if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
-        plugins->erase(plugins->begin() + i);
+    for (std::vector<WebPluginInfo>::iterator it = plugins->begin();

[jam, 2010/12/17 19:14:45]

please leave as before

[pastarmovj, 2010/12/20 19:57:37]

Done.

+         it != plugins->end();
+         ++it) {
+      if (it->path.BaseName().value() == kOldWMPPlugin) {
+        // TODO(pastarmovj): We can't just remove it like that. We could
+        // possibly disable it first.

[jam, 2010/12/17 19:14:45]

why can't we remove it like this?  why is this a TODO, i.e. why not fix this
now?

[pastarmovj, 2010/12/20 19:57:37]

Now we can again :)

+        plugins->erase(it);
         break;
       }
     }
   } else if (filename == kOldWMPPlugin) {
-    for (size_t i = 0; i < plugins->size(); ++i) {
-      if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
+    for (std::vector<WebPluginInfo>::iterator it = plugins->begin();

[jam, 2010/12/17 19:14:45]

please leave as before

[pastarmovj, 2010/12/20 19:57:37]

Done.

+         it != plugins->end();
+         ++it) {
+      if (it->path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace NPAPI