Modify NPAPI::PluginList::GetPluginInfo() to return true also for disabled plugins.

webkit/glue/plugins/plugin_list.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 363 matching lines @@
   }
 }
 
 bool PluginList::GetPluginInfo(const GURL& url,
                                const std::string& mime_type,
                                bool allow_wildcard,
                                WebPluginInfo* info,
                                std::string* actual_mime_type) {
   bool found = FindPlugin(mime_type, allow_wildcard, info);
   if (!found || (info->path.value() == kDefaultPluginLibraryName)) {
-    WebPluginInfo info2;
-    if (FindPlugin(url, actual_mime_type, &info2)) {
-      found = true;
-      *info = info2;
-    } else if (FindDisabledPlugin(mime_type, allow_wildcard, &info2)) {
-      found = false;
-    }
+    found = FindPlugin(url, actual_mime_type, info) ||
+        FindDisabledPlugin(mime_type, allow_wildcard, info);
   }
 
   return found;
 }
 
 bool PluginList::GetPluginInfoByPath(const FilePath& plugin_path,
                                      WebPluginInfo* info) {
   LoadPlugins(false);
   AutoLock lock(lock_);
   for (size_t i = 0; i < plugins_.size(); ++i) {
@@ skipping 53 matching lines @@
   }
 
   return did_disable;
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
 }  // namespace NPAPI