Revert 171389

content/browser/renderer_host/pepper/browser_ppapi_host_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/renderer_host/pepper/browser_ppapi_host_impl.h"
+
 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
-
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace content {
 
 // static
 BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
     IPC::Sender* sender,
     ppapi::PpapiPermissions permissions,
     base::ProcessHandle plugin_child_process,
+    int plugin_child_process_id,
     IPC::ChannelProxy* channel,
     net::HostResolver* host_resolver,
     int render_process_id,
     int render_view_id) {
+  // TODO(raymes): Figure out how to plumb plugin_name and
+  // profile_data_directory through for NaCl. They are currently only needed for
+  // PPB_Flash_File interfaces so it doesn't matter.
+  std::string plugin_name;
+  FilePath profile_data_directory;
   BrowserPpapiHostImpl* browser_ppapi_host =
-      new BrowserPpapiHostImpl(sender, permissions);
+      new BrowserPpapiHostImpl(sender, permissions, plugin_name,
+                               profile_data_directory, plugin_child_process_id);
   browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
 
   channel->AddFilter(
       new PepperMessageFilter(PepperMessageFilter::NACL,
                               permissions,
                               host_resolver,
                               render_process_id,
                               render_view_id));
   channel->AddFilter(browser_ppapi_host->message_filter());
 
   return browser_ppapi_host;
 }
 
 BrowserPpapiHostImpl::BrowserPpapiHostImpl(
     IPC::Sender* sender,
-    const ppapi::PpapiPermissions& permissions)
+    const ppapi::PpapiPermissions& permissions,
+    const std::string& plugin_name,
+    const FilePath& profile_data_directory,
+    int plugin_process_id)
     : ppapi_host_(sender, permissions),
-      plugin_process_handle_(base::kNullProcessHandle) {
+      plugin_process_handle_(base::kNullProcessHandle),
+      plugin_name_(plugin_name),
+      profile_data_directory_(profile_data_directory),
+      plugin_process_id_(plugin_process_id) {
   message_filter_ = new HostMessageFilter(&ppapi_host_);
   ppapi_host_.AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
       new ContentBrowserPepperHostFactory(this)));
 }
 
 BrowserPpapiHostImpl::~BrowserPpapiHostImpl() {
   // Notify the filter so it won't foward messages to us.
   message_filter_->OnHostDestroyed();
 }
 
@@ skipping 20 matching lines @@
     *render_process_id = 0;
     *render_view_id = 0;
     return false;
   }
 
   *render_process_id = found->second.process_id;
   *render_view_id = found->second.view_id;
   return true;
 }
 
+const std::string& BrowserPpapiHostImpl::GetPluginName() {
+  return plugin_name_;
+}
+
+const FilePath& BrowserPpapiHostImpl::GetProfileDataDirectory() {
+  return profile_data_directory_;
+}
+
+int BrowserPpapiHostImpl::GetPluginProcessID() {
+  return plugin_process_id_;
+}
+
 void BrowserPpapiHostImpl::AddInstanceForView(PP_Instance instance,
                                               int render_process_id,
                                               int render_view_id) {
   DCHECK(instance_to_view_.find(instance) == instance_to_view_.end());
 
   RenderViewIDs ids;
   ids.process_id = render_process_id;
   ids.view_id = render_view_id;
   instance_to_view_[instance] = ids;
 }
@@ skipping 23 matching lines @@
   */
   return ppapi_host_->OnMessageReceived(msg);
 }
 
 void BrowserPpapiHostImpl::HostMessageFilter::OnHostDestroyed() {
   DCHECK(ppapi_host_);
   ppapi_host_ = NULL;
 }
 
 }  // namespace content