Override plug-ins by path instead of name.

chrome/browser/chrome_plugin_service_filter.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/chrome_plugin_service_filter.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 26 matching lines @@
 void ChromePluginServiceFilter::UnregisterResourceContext(
     const void* context) {
   base::AutoLock lock(lock_);
   resource_context_map_.erase(context);
 }
 
 void ChromePluginServiceFilter::OverridePluginForTab(
     int render_process_id,
     int render_view_id,
     const GURL& url,
-    const string16& plugin_name) {
+    const webkit::WebPluginInfo& plugin) {
   OverriddenPlugin overridden_plugin;
   overridden_plugin.render_process_id = render_process_id;
   overridden_plugin.render_view_id = render_view_id;
   overridden_plugin.url = url;
-  overridden_plugin.plugin_name = plugin_name;
+  overridden_plugin.plugin = plugin;
   base::AutoLock auto_lock(lock_);
   overridden_plugins_.push_back(overridden_plugin);
 }
 
 void ChromePluginServiceFilter::RestrictPluginToProfileAndOrigin(
     const FilePath& plugin_path,
     Profile* profile,
     const GURL& origin) {
   base::AutoLock auto_lock(lock_);
   restricted_plugins_[plugin_path] =
@@ skipping 15 matching lines @@
     const GURL& policy_url,
     webkit::WebPluginInfo* plugin) {
   base::AutoLock auto_lock(lock_);
   // Check whether the plugin is overridden.
   for (size_t i = 0; i < overridden_plugins_.size(); ++i) {
     if (overridden_plugins_[i].render_process_id == render_process_id &&
         overridden_plugins_[i].render_view_id == render_view_id &&
         (overridden_plugins_[i].url == url ||
          overridden_plugins_[i].url.is_empty())) {
 
-      bool use = overridden_plugins_[i].plugin_name == plugin->name;
-      if (use &&
-          plugin->name == ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName)) {
-        // If the caller is forcing the Adobe Reader plugin, then don't show the
-        // blocked plugin UI if it's vulnerable.
-        plugin->version = ASCIIToUTF16("11.0.0.0");
-      }
+      bool use = overridden_plugins_[i].plugin.path == plugin->path;
+      if (use)
+        *plugin = overridden_plugins_[i].plugin;
+
       return use;
     }
   }
 
   // Check whether the plugin is disabled.
   ResourceContextMap::iterator prefs_it =
       resource_context_map_.find(context);
   if (prefs_it == resource_context_map_.end())
     return false;
 
@@ skipping 56 matching lines @@
         PluginService::GetInstance()->PurgePluginListCache(
             profile->GetOffTheRecordProfile(), false);
       }
       break;
     }
     default: {
       NOTREACHED();
     }
   }
 }