Replace ViewHostMsg_GetPluginPath with ViewHostMsg_GetPluginInfo.

chrome/browser/plugin_service.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 "build/build_config.h"
 
 #include "chrome/browser/plugin_service.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 210 matching lines @@
   return plugin_host;
 }
 
 void PluginService::OpenChannelToPlugin(
     ResourceMessageFilter* renderer_msg_filter,
     const GURL& url,
     const std::string& mime_type,
     const std::wstring& locale,
     IPC::Message* reply_msg) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
-  // We don't need a policy URL here because that was already checked by a
-  // previous call to GetPluginPath.
-  GURL policy_url;
-  FilePath plugin_path = GetPluginPath(url, policy_url, mime_type, NULL);
+  bool allow_wildcard = true;
+  WebPluginInfo info;
+  FilePath plugin_path;
+  if (NPAPI::PluginList::Singleton()->GetPluginInfo(
+      url, mime_type, allow_wildcard, &info, NULL) && info.enabled) {
+    plugin_path = info.path;
+  }
   PluginProcessHost* plugin_host = FindOrStartPluginProcess(plugin_path);
   if (plugin_host) {
     plugin_host->OpenChannelToPlugin(renderer_msg_filter, mime_type, reply_msg);
   } else {
     PluginProcessHost::ReplyToRenderer(
         renderer_msg_filter, IPC::ChannelHandle(), WebPluginInfo(), reply_msg);
   }
 }
 
-FilePath PluginService::GetPluginPath(const GURL& url,
-                                      const GURL& policy_url,
-                                      const std::string& mime_type,
-                                      std::string* actual_mime_type) {
-  bool allow_wildcard = true;
-  WebPluginInfo info;
-  if (NPAPI::PluginList::Singleton()->GetPluginInfo(
-        url, mime_type, allow_wildcard, &info, actual_mime_type) &&
-      info.enabled && PluginAllowedForURL(info.path, policy_url)) {
-    return info.path;
-  }
-
-  return FilePath();
-}
-
 static void PurgePluginListCache(bool reload_pages) {
   for (RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
        !it.IsAtEnd(); it.Advance()) {
     it.GetCurrentValue()->Send(new ViewMsg_PurgePluginListCache(reload_pages));
   }
 }
 
 void PluginService::OnWaitableEventSignaled(
     base::WaitableEvent* waitable_event) {
 #if defined(OS_WIN)
@@ skipping 60 matching lines @@
                              NewRunnableFunction(&NotifyPluginsOfActivation));
       break;
     }
 #endif
 
     default:
       DCHECK(false);
   }
 }
 
-bool PluginService::PluginAllowedForURL(const FilePath& plugin_path,
-                                        const GURL& url) {
+bool PluginService::PrivatePluginAllowedForURL(const FilePath& plugin_path,
+                                               const GURL& url) {
   if (url.is_empty())
     return true;  // Caller wants all plugins.
 
   PrivatePluginMap::iterator it = private_plugins_.find(plugin_path);
   if (it == private_plugins_.end())
     return true;  // This plugin is not private, so it's allowed everywhere.
 
   // We do a dumb compare of scheme and host, rather than using the domain
   // service, since we only care about this for extensions.
   const GURL& required_url = it->second;
@@ skipping 16 matching lines @@
     info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|'));
 
     // These NPAPI entry points will never be called.  TODO(darin): Come up
     // with a cleaner way to register pepper plugins with the NPAPI PluginList,
     // or perhaps refactor the PluginList to be less specific to NPAPI.
     memset(&info.entry_points, 0, sizeof(info.entry_points));
 
     NPAPI::PluginList::Singleton()->RegisterInternalPlugin(info);
   }
 }