Use a placeholder instead of the default plugin for missing plug-ins on Mac and Linux.

content/browser/plugin_service.cc

 // Copyright (c) 2011 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 "content/browser/plugin_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 392 matching lines @@
 bool PluginService::GetPluginInfo(int render_process_id,
                                   int render_view_id,
                                   const content::ResourceContext& context,
                                   const GURL& url,
                                   const GURL& page_url,
                                   const std::string& mime_type,
                                   bool allow_wildcard,
                                   bool* use_stale,
                                   webkit::WebPluginInfo* info,
                                   std::string* actual_mime_type) {
-  webkit::npapi::PluginList* plugin_list =
-      webkit::npapi::PluginList::Singleton();
-  // GetPluginInfoArray may need to load the plugins, so we need to be
-  // on the FILE thread.
-  DCHECK(use_stale || BrowserThread::CurrentlyOn(BrowserThread::FILE));
   std::vector<webkit::WebPluginInfo> plugins;
   std::vector<std::string> mime_types;
-  plugin_list->GetPluginInfoArray(
-      url, mime_type, allow_wildcard, use_stale, &plugins, &mime_types);
-  if (plugins.size() > 1 &&
-      plugins.back().path ==
-          FilePath(webkit::npapi::kDefaultPluginLibraryName)) {
-    // If there is at least one plug-in handling the required MIME type (apart
-    // from the default plug-in), we don't need the default plug-in.
-    plugins.pop_back();
-  }
-
+  std::vector<bool> allowed;
+  GetMatchingPlugins(
+      render_process_id, render_view_id, context, url, page_url, mime_type,
+      allow_wildcard, use_stale, &plugins, &mime_types, &allowed);
   for (size_t i = 0; i < plugins.size(); ++i) {
-    if (!filter_ || filter_->ShouldUsePlugin(render_process_id,
-                                             render_view_id,
-                                             &context,
-                                             url,
-                                             page_url,
-                                             &plugins[i])) {
+    if (allowed[i]) {
       *info = plugins[i];
       if (actual_mime_type)
         *actual_mime_type = mime_types[i];
       return true;
     }
   }
   return false;
 }
 
+void PluginService::GetMatchingPlugins(
+    int render_process_id,
+    int render_view_id,
+    const content::ResourceContext& context,
+    const GURL& url,
+    const GURL& page_url,
+    const std::string& mime_type,
+    bool allow_wildcard,
+    bool* use_stale,
+    std::vector<webkit::WebPluginInfo>* plugins,
+    std::vector<std::string>* mime_types,
+    std::vector<bool>* allowed) {
+  webkit::npapi::PluginList* plugin_list =
+      webkit::npapi::PluginList::Singleton();
+  // GetPluginInfoArray may need to load the plugins, so we need to be
+  // on the FILE thread.
+  DCHECK(use_stale || BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  plugin_list->GetPluginInfoArray(
+      url, mime_type, allow_wildcard, use_stale, plugins, mime_types);
+  if (plugins->size() > 1 &&
+      plugins->back().path ==
+          FilePath(webkit::npapi::kDefaultPluginLibraryName)) {
+    // If there is at least one plug-in handling the required MIME type (apart
+    // from the default plug-in), we don't need the default plug-in.
+    plugins->pop_back();
+  }
+
+  for (size_t i = 0; i < plugins->size(); ++i) {
+    bool plugin_allowed = true;
+    if (filter_) {
+      plugin_allowed = filter_->ShouldUsePlugin(render_process_id,
+                                                   render_view_id,
+                                                   &context,
+                                                   url,
+                                                   page_url,
+                                                   &(*plugins)[i]);
+    }
+    allowed->push_back(plugin_allowed);
+  }
+}
+
 void PluginService::RefreshPluginList() {
   webkit::npapi::PluginList::Singleton()->RefreshPlugins();
 }
 
 void PluginService::GetPlugins(const GetPluginsCallback& callback) {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&PluginService::GetPluginsInternal, base::Unretained(this),
           MessageLoop::current()->message_loop_proxy(),
           callback));
 }
@@ skipping 91 matching lines @@
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // static
 void PluginService::RegisterFilePathWatcher(
     FilePathWatcher *watcher,
     const FilePath& path,
     FilePathWatcher::Delegate* delegate) {
   bool result = watcher->Watch(path, delegate);
   DCHECK(result);
 }
 #endif