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

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 12ba59e97f23af028297c749c9db201db7470547..855eb859bc10460da818d80dd5602fd6b3329955 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -297,7 +297,7 @@ void RenderMessageFilter::OverrideThreadForMessage(const IPC::Message& message,
   switch (message.type()) {
     // The PluginService::GetPluginInfo may need to load the plugins.  Don't do
     // it on the IO thread.
-    case ViewHostMsg_GetPluginInfo::ID:
+    case ViewHostMsg_GetMatchingPlugins::ID:
       *thread = BrowserThread::FILE;
       break;
     default:
@@ -337,7 +337,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
     IPC_MESSAGE_HANDLER(ViewHostMsg_LoadFont, OnLoadFont)
 #endif
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetPlugins, OnGetPlugins)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_GetPluginInfo, OnGetPluginInfo)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_GetMatchingPlugins, OnGetMatchingPlugins)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DownloadUrl, OnDownloadUrl)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPlugin,
                                     OnOpenChannelToPlugin)
@@ -559,19 +559,19 @@ void RenderMessageFilter::GetPluginsCallback(
   Send(reply_msg);
 }
 
-void RenderMessageFilter::OnGetPluginInfo(
+void RenderMessageFilter::OnGetMatchingPlugins(
     int routing_id,
     const GURL& url,
     const GURL& page_url,
     const std::string& mime_type,
-    bool* found,
-    webkit::WebPluginInfo* info,
-    std::string* actual_mime_type) {
+    std::vector<webkit::WebPluginInfo>* plugins,
+    std::vector<std::string>* mime_types,
+    std::vector<bool>* allowed) {
   bool allow_wildcard = true;
-  *found = plugin_service_->GetPluginInfo(
+  plugin_service_->GetMatchingPlugins(
       render_process_id_, routing_id, resource_context_,
       url, page_url, mime_type, allow_wildcard,
-      NULL, info, actual_mime_type);
+      NULL, plugins, mime_types, allowed);
 }
 
 void RenderMessageFilter::OnOpenChannelToPlugin(int routing_id,