Replace ViewHostMsg_GetPluginPath with ViewHostMsg_GetPluginInfo.

chrome/renderer/render_view.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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2182 matching lines @@
   if (RenderThread::current())  // Will be NULL during unit tests.
     RenderThread::current()->DoNotSuspendWebKitSharedTimer();
 
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_));
 }
 
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebPlugin* RenderView::createPlugin(WebFrame* frame,
                                     const WebPluginParams& params) {
-  FilePath path;
+  bool found = false;
+  WebPluginInfo info;
+  GURL url(params.url);
+  std::string mime_type(params.mimeType.utf8());
   std::string actual_mime_type;
-  render_thread_->Send(new ViewHostMsg_GetPluginPath(
-      params.url, frame->top()->url(), params.mimeType.utf8(), &path,
+  Send(new ViewHostMsg_GetPluginInfo(url,
+                                     frame->top()->url(),
+                                     mime_type,
+                                     &found,
+                                     &info,
       &actual_mime_type));
-  if (path.value().empty())
+
+  if (!found || !info.enabled)
     return NULL;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableClickToPlay)) {
     if (!AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS) &&
-        path.value() != kDefaultPluginLibraryName) {
+      info.path.value() != kDefaultPluginLibraryName) {
       didNotAllowPlugins(frame);
       return CreatePluginPlaceholder(frame, params);
     }
   }
-  return CreatePluginInternal(frame, params, actual_mime_type, path);
+  return CreatePluginInternal(frame, params, &info, actual_mime_type);
 }
 
 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
   int appcache_host_id = appcache_host ? appcache_host->host_id() : 0;
   return new WebWorkerProxy(client, RenderThread::current(), routing_id_,
                             appcache_host_id);
 }
 
@@ skipping 1438 matching lines @@
   }
 }
 
 void RenderView::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
 }
 
 WebPlugin* RenderView::CreatePluginInternal(WebFrame* frame,
                                             const WebPluginParams& params,
-                                            const std::string& mime_type,
-                                            const FilePath& plugin_path) {
-  FilePath path(plugin_path);
+                                            WebPluginInfo* plugin_info,
+                                            const std::string& mime_type) {
   std::string actual_mime_type(mime_type);
-  if (path.value().empty()) {
-    render_thread_->Send(new ViewHostMsg_GetPluginPath(
-        params.url, frame->top()->url(), params.mimeType.utf8(), &path,
-        &actual_mime_type));
+  WebPluginInfo info;
+  if (plugin_info != NULL) {
+    info = *plugin_info;
+  } else {
+    bool found;
+    std::string actual_mime_type(mime_type);
+    Send(new ViewHostMsg_GetPluginInfo(
+        params.url, frame->top()->url(), params.mimeType.utf8(), &found,
+        &info, &actual_mime_type));
+    if (!found)
+      info.enabled = false;
   }
-  if (path.value().empty())
+  if (!info.enabled)
     return NULL;
 
   if (actual_mime_type.empty())
     actual_mime_type = params.mimeType.utf8();
 
   scoped_refptr<pepper::PluginModule> pepper_module =
-      PepperPluginRegistry::GetInstance()->GetModule(path);
+      PepperPluginRegistry::GetInstance()->GetModule(info.path);
   if (pepper_module) {
     WebPlugin* plugin = new pepper::WebPluginImpl(pepper_module, params,
                                                   pepper_delegate_.AsWeakPtr());
     if (plugin && !frame->parent() && frame->document().isPluginDocument()) {
       // If this is a full-page plugin hosting the internal PDF plugin, we want
       // to notify the browser so that it can treat things like zooming
       // differently.
       // TODO(sanjeevr): Use a Pepper interface to determine this rather than
       // hardcode this for the PDF plugin path.
       FilePath pdf_path;
       PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
-      if (path == pdf_path)
+      if (info.path == pdf_path)
         Send(new ViewHostMsg_SetDisplayingPDFContent(routing_id_));
     }
     return plugin;
   }
 
-  return new webkit_glue::WebPluginImpl(frame, params, path, actual_mime_type,
-                                        AsWeakPtr());
+  return new webkit_glue::WebPluginImpl(frame, params, info.path,
+                                        actual_mime_type, AsWeakPtr());
 }
 
 WebPlugin* RenderView::CreatePluginPlaceholder(WebFrame* frame,
                                                const WebPluginParams& params) {
   // |blocked_plugin| will delete itself when the WebViewPlugin is destroyed.
   BlockedPlugin* blocked_plugin = new BlockedPlugin(this, frame, params);
   WebViewPlugin* plugin = blocked_plugin->plugin();
   webkit_preferences_.Apply(plugin->web_view());
   return plugin;
 }
@@ skipping 1511 matching lines @@
     // the origins of the two domains are different. This can be treated as a
     // top level navigation and routed back to the host.
     WebKit::WebFrame* opener = frame->opener();
     if (opener) {
       if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
         return true;
     }
   }
   return false;
 }