Allow loading multiple plug-ins with the same base name on Mac.

The rationale for not allowing it was to let plug-ins from higher in the hierarchy (i.e. ~/Library/Internet Plugins) override plug-ins from deeper (i.e. /Library/Internet Plugins), but loading them earlier already takes care of that.

BUG=132894
TEST=see bug for manual test


Review URL: https://chromiumcodereview.appspot.com/10555003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142723 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 18 deletions

diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
index 62c3768a..a1c91bb 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/plugins/npapi/plugin_list_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -97,23 +97,7 @@ void PluginList::GetPluginsInDir(
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   ScopedVector<PluginGroup>* plugin_groups) {
-  if (IsBlacklistedPlugin(info))
-    return false;
-
-  // Hierarchy check
-  // (we're loading plugins hierarchically from Library folders, so plugins we
-  //  encounter earlier must override plugins we encounter later)
-  for (size_t i = 0; i < plugin_groups->size(); ++i) {
-    const std::vector<WebPluginInfo>& plugins =
-        (*plugin_groups)[i]->web_plugin_infos();
-    for (size_t j = 0; j < plugins.size(); ++j) {
-      if (plugins[j].path.BaseName() == info.path.BaseName()) {
-        return false;  // Already have a loaded plugin higher in the hierarchy.
-      }
-    }
-  }
-
-  return true;
+  return !IsBlacklistedPlugin(info);
 }
 
 }  // namespace npapi