Switched proxy for TCPServerSocketPrivate.

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/browser/tracing/trace_message_filter.h"
 #include "content/common/pepper_renderer_instance_data.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/process_type.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace content {
 
 // static
 BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
     IPC::Sender* sender,
     ppapi::PpapiPermissions permissions,
     base::ProcessHandle plugin_child_process,
     IPC::ChannelProxy* channel,
     net::HostResolver* host_resolver,
     int render_process_id,
     int render_view_id,
     const base::FilePath& profile_directory) {
-  // The plugin name and path shouldn't be needed for NaCl apps.
-  BrowserPpapiHostImpl* browser_ppapi_host =
-      new BrowserPpapiHostImpl(sender, permissions, std::string(),
-                               base::FilePath(), profile_directory, true);
-  browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
-
-  channel->AddFilter(
+  scoped_refptr<PepperMessageFilter> pepper_message_filter(
       new PepperMessageFilter(permissions,
                               host_resolver,
                               render_process_id,
                               render_view_id));
+
+  // The plugin name and path shouldn't be needed for external plugins.
+  BrowserPpapiHostImpl* browser_ppapi_host =
+      new BrowserPpapiHostImpl(sender, permissions, std::string(),
+                               base::FilePath(), profile_directory, true,
+                               pepper_message_filter);
+  browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
+
+  channel->AddFilter(pepper_message_filter);
   channel->AddFilter(browser_ppapi_host->message_filter().get());
   channel->AddFilter(new TraceMessageFilter());
 
   return browser_ppapi_host;
 }
 
 BrowserPpapiHostImpl::BrowserPpapiHostImpl(
     IPC::Sender* sender,
     const ppapi::PpapiPermissions& permissions,
     const std::string& plugin_name,
     const base::FilePath& plugin_path,
     const base::FilePath& profile_data_directory,
-    bool external_plugin)
+    bool external_plugin,
+    const scoped_refptr<PepperMessageFilter>& pepper_message_filter)
     : ppapi_host_(new ppapi::host::PpapiHost(sender, permissions)),
       plugin_process_handle_(base::kNullProcessHandle),
       plugin_name_(plugin_name),
       plugin_path_(plugin_path),
       profile_data_directory_(profile_data_directory),
       external_plugin_(external_plugin) {
   message_filter_ = new HostMessageFilter(ppapi_host_.get());
   ppapi_host_->AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
-      new ContentBrowserPepperHostFactory(this)));
+      new ContentBrowserPepperHostFactory(this, pepper_message_filter)));
 }
 
 BrowserPpapiHostImpl::~BrowserPpapiHostImpl() {
   // Notify the filter so it won't foward messages to us.
   message_filter_->OnHostDestroyed();
 
   // Delete the host explicitly first. This shutdown will destroy the
   // resources, which may want to do cleanup in their destructors and expect
   // their pointers to us to be valid.
   ppapi_host_.reset();
@@ skipping 87 matching lines @@
   */
   return ppapi_host_->OnMessageReceived(msg);
 }
 
 void BrowserPpapiHostImpl::HostMessageFilter::OnHostDestroyed() {
   DCHECK(ppapi_host_);
   ppapi_host_ = NULL;
 }
 
 }  // namespace content