Open pepper files directly in browser.

content/browser/plugin_service_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 224 matching lines @@
     const FilePath& plugin_path) {
   for (PluginProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter->info().path == plugin_path)
       return *iter;
   }
 
   return NULL;
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindPpapiPluginProcess(
-    const FilePath& plugin_path) {
+    const FilePath& plugin_path,
+    const FilePath& profile_data_directory_path) {
   for (PpapiPluginProcessHostIterator iter; !iter.Done(); ++iter) {
-    if (iter->plugin_path() == plugin_path)
+    if (iter->plugin_path() == plugin_path &&
+        iter->profile_data_directory() == profile_data_directory_path) {
       return *iter;
+    }
   }
-
   return NULL;
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindPpapiBrokerProcess(
     const FilePath& broker_path) {
   for (PpapiBrokerProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter->plugin_path() == broker_path)
       return *iter;
   }
 
@@ skipping 17 matching lines @@
   scoped_ptr<PluginProcessHost> new_host(new PluginProcessHost());
   if (!new_host->Init(info)) {
     NOTREACHED();  // Init is not expected to fail.
     return NULL;
   }
   return new_host.release();
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
     const FilePath& plugin_path,
+    const FilePath& data_directory_path,
     PpapiPluginProcessHost::PluginClient* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  PpapiPluginProcessHost* plugin_host = FindPpapiPluginProcess(plugin_path);
+  PpapiPluginProcessHost* plugin_host =
+      FindPpapiPluginProcess(plugin_path, data_directory_path);
   if (plugin_host)
     return plugin_host;
 
   // Validate that the plugin is actually registered.
   content::PepperPluginInfo* info = GetRegisteredPpapiPluginInfo(plugin_path);
   if (!info)
     return NULL;
 
   // This plugin isn't loaded by any plugin process, so create a new process.
   return PpapiPluginProcessHost::CreatePluginHost(
-      *info,
+      *info, data_directory_path,
       client->GetResourceContext()->GetHostResolver());
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
     const FilePath& plugin_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PpapiPluginProcessHost* plugin_host = FindPpapiBrokerProcess(plugin_path);
   if (plugin_host)
     return plugin_host;
@@ skipping 27 matching lines @@
     render_view_id,
     page_url,
     client->GetResourceContext()
   };
   GetPlugins(base::Bind(
       &PluginServiceImpl::ForwardGetAllowedPluginForOpenChannelToPlugin,
       base::Unretained(this), params, url, mime_type, client));
 }
 
 void PluginServiceImpl::OpenChannelToPpapiPlugin(
-    const FilePath& path,
+    const FilePath& plugin_path,
+    const FilePath& data_directory_path,
     PpapiPluginProcessHost::PluginClient* client) {
-  PpapiPluginProcessHost* plugin_host = FindOrStartPpapiPluginProcess(
-      path, client);
+  PpapiPluginProcessHost* plugin_host =
+      FindOrStartPpapiPluginProcess(plugin_path, data_directory_path, client);
   if (plugin_host) {
     plugin_host->OpenChannelToPlugin(client);
   } else {
     // Send error.
     client->OnPpapiChannelOpened(IPC::ChannelHandle(), 0);
   }
 }
 
 void PluginServiceImpl::OpenChannelToPpapiBroker(
     const FilePath& path,
@@ skipping 363 matching lines @@
   plugin_list_->RegisterInternalPlugin(info, add_at_beginning);
 }
 
 string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) {
   return plugin_list_->GetPluginGroupName(plugin_name);
 }
 
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }