This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ...

chrome/browser/plugin_service.cc

 // Copyright (c) 2006-2008 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/string_util.h"
@@ skipping 123 matching lines @@
 
   // This plugin isn't loaded by any plugin process, so create a new process.
   plugin_host = new PluginProcessHost();
   if (!plugin_host->Init(info, clsid, ui_locale_)) {
     DCHECK(false);  // Init is not expected to fail
     delete plugin_host;
     return NULL;
   }
 
   return plugin_host;
-
-  // TODO(jabdelmalek): adding a new channel means we can have one less
-  // renderer process (since each child process uses one handle in the
-  // IPC thread and main thread's WaitForMultipleObjects call).  Limit the
-  // number of plugin processes.
 }
 
 void PluginService::OpenChannelToPlugin(
     ResourceMessageFilter* renderer_msg_filter, const GURL& url,
     const std::string& mime_type, const std::string& clsid,
     const std::wstring& locale, IPC::Message* reply_msg) {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(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, clsid, NULL);
   PluginProcessHost* plugin_host = FindOrStartPluginProcess(plugin_path, clsid);
   if (plugin_host) {
     plugin_host->OpenChannelToPlugin(renderer_msg_filter, mime_type, reply_msg);
   } else {
     PluginProcessHost::ReplyToRenderer(renderer_msg_filter,
                                        IPC::ChannelHandle(),
-                                       FilePath(),
+                                       WebPluginInfo(),
                                        reply_msg);
   }
 }
 
 FilePath PluginService::GetPluginPath(const GURL& url,
                                       const GURL& policy_url,
                                       const std::string& mime_type,
                                       const std::string& clsid,
                                       std::string* actual_mime_type) {
   bool allow_wildcard = true;
@@ skipping 66 matching lines @@
   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;
   return (url.scheme() == required_url.scheme() &&
           url.host() == required_url.host());
 }