Revert 180600

chrome/browser/plugins/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/plugins/chrome_plugin_service_filter.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
@@ skipping 51 matching lines @@
       std::make_pair(PluginPrefs::GetForProfile(profile),
                      origin);
 }
 
 void ChromePluginServiceFilter::UnrestrictPlugin(
     const FilePath& plugin_path) {
   base::AutoLock auto_lock(lock_);
   restricted_plugins_.erase(plugin_path);
 }
 
-bool ChromePluginServiceFilter::IsPluginAvailable(
+bool ChromePluginServiceFilter::IsPluginEnabled(
     int render_process_id,
     int render_view_id,
     const void* context,
     const GURL& url,
     const GURL& policy_url,
     webkit::WebPluginInfo* plugin) {
   base::AutoLock auto_lock(lock_);
   const ProcessDetails* details = GetProcess(render_process_id);
 
   // Check whether the plugin is overridden.
   if (details) {
     for (size_t i = 0; i < details->overridden_plugins.size(); ++i) {
       if (details->overridden_plugins[i].render_view_id == render_view_id &&
           (details->overridden_plugins[i].url == url ||
            details->overridden_plugins[i].url.is_empty())) {
 
         bool use = details->overridden_plugins[i].plugin.path == plugin->path;
-        if (use)
-          *plugin = details->overridden_plugins[i].plugin;
-        return use;
+        if (!use)
+          return false;
+        *plugin = details->overridden_plugins[i].plugin;
+        break;
       }
     }
   }
 
   // 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 114 matching lines @@
 
 ChromePluginServiceFilter::OverriddenPlugin::~OverriddenPlugin() {
 }
 
 ChromePluginServiceFilter::ProcessDetails::ProcessDetails() {
 }
 
 ChromePluginServiceFilter::ProcessDetails::~ProcessDetails() {
 }