Policy: Re-enabled plugin still disabled

webkit/plugins/npapi/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/plugins/npapi/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
@@ skipping 232 matching lines @@
   // the plugins are found.  We are going to copy this as well.
   GetAcrobatDirectory(&dirs);
   GetQuicktimeDirectory(&dirs);
   GetWindowsMediaDirectory(&dirs);
 
   for (std::set<FilePath>::iterator i = dirs.begin(); i != dirs.end(); ++i)
     plugin_dirs->push_back(*i);
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath &path,
-                                    std::vector<WebPluginInfo>* plugins,
+                                    ScopedVector<PluginGroup>* plugin_groups,
                                     std::set<FilePath>* visited_plugins) {
   WIN32_FIND_DATA find_file_data;
   HANDLE find_handle;
 
   std::wstring dir = path.value();
   // FindFirstFile requires that you specify a wildcard for directories.
   dir.append(L"\\NP*.DLL");
 
   find_handle = FindFirstFile(dir.c_str(), &find_file_data);
   if (find_handle == INVALID_HANDLE_VALUE)
     return;
 
   do {
     if (!(find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
       FilePath filename = path.Append(find_file_data.cFileName);
-      LoadPlugin(filename, plugins);
+      LoadPlugin(filename, plugin_groups);
       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,
+    ScopedVector<PluginGroup>* plugin_groups,
     std::set<FilePath>* visited_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);
+    LoadPlugin(*i, plugin_groups);
     visited_plugins->insert(*i);
   }
 }
 
 // Returns true if the given plugins share at least one mime type.  This is used
 // to differentiate newer versions of a plugin vs two plugins which happen to
 // have the same filename.
 bool HaveSharedMimeType(const WebPluginInfo& plugin1,
                         const WebPluginInfo& plugin2) {
   for (size_t i = 0; i < plugin1.mime_types.size(); ++i) {
@@ skipping 27 matching lines @@
 
     if (cur_a > cur_b)
       return false;
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
-                                  std::vector<WebPluginInfo>* plugins) {
+                                  ScopedVector<PluginGroup>* plugin_groups) {
   // Version check
 
-  for (size_t i = 0; i < plugins->size(); ++i) {
-    std::wstring plugin1 =
-        StringToLowerASCII((*plugins)[i].path.BaseName().ToWStringHack());
-    std::wstring plugin2 =
-        StringToLowerASCII(info.path.BaseName().ToWStringHack());
-    if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[i], info)) ||
-        (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
-        (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
-      if (!IsNewerVersion((*plugins)[i].version, info.version))
-        return false;  // We have loaded a plugin whose version is newer.
+  for (size_t i = 0; i < plugin_groups->size(); ++i) {
+    const std::vector<WebPluginInfo>& plugins =
+        (*plugin_groups)[i]->web_plugins_info();
+    for (size_t j = 0; j < plugins.size(); ++j) {
+      std::wstring plugin1 =
+          StringToLowerASCII(plugins[j].path.BaseName().ToWStringHack());
+      std::wstring plugin2 =
+          StringToLowerASCII(info.path.BaseName().ToWStringHack());
+      if ((plugin1 == plugin2 && HaveSharedMimeType(plugins[j], info)) ||
+          (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
+          (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
+        if (!IsNewerVersion(plugins[j].version, info.version))
+          return false;  // We have loaded a plugin whose version is newer.
 
-      plugins->erase(plugins->begin() + i);
-      break;
+        (*plugin_groups)[i]->RemovePlugin(plugins[j].path);
+        break;
+      }
     }
   }
 
   // Troublemakers
 
   std::wstring filename = StringToLowerASCII(info.path.BaseName().value());
   // Depends on XPCOM.
   if (filename == kMozillaActiveXPlugin)
     return false;
 
@@ skipping 25 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);
-        break;
+    for (size_t i = 0; i < plugin_groups->size(); ++i) {
+      const std::vector<WebPluginInfo>& plugins =
+          (*plugin_groups)[i]->web_plugins_info();
+      for (size_t j = 0; j < plugins.size(); ++j) {
+        if (plugins[j].path.BaseName().value() == kOldWMPPlugin) {
+          (*plugin_groups)[i]->RemovePlugin(plugins[j].path);
+          break;
+        }
       }
     }
   } else if (filename == kOldWMPPlugin) {
-    for (size_t i = 0; i < plugins->size(); ++i) {
-      if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
-        return false;
+    for (size_t i = 0; i < plugin_groups->size(); ++i) {
+      const std::vector<WebPluginInfo>& plugins =
+          (*plugin_groups)[i]->web_plugins_info();
+      for (size_t j = 0; j < plugins.size(); ++j) {
+        if (plugins[j].path.BaseName().value() == kNewWMPPlugin)
+          return false;
+      }
     }
   }
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit