Change NaCl IPC PPAPI proxy startup to support a NaCl-Browser process

chrome/browser/nacl_host/nacl_process_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/process.h"
 #include "chrome/common/nacl_types.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
 
 class ChromeRenderMessageFilter;
 class CommandLine;
 class ExtensionInfoMap;
 
 namespace content {
 class BrowserChildProcessHost;
 }
 
+namespace IPC {
+class ChannelProxy;
+}
+
 // Represents the browser side of the browser <--> NaCl communication
 // channel. There will be one NaClProcessHost per NaCl process
 // The browser is responsible for starting the NaCl process
 // when requested by the renderer.
 // After that, most of the communication is directly between NaCl plugin
 // running in the renderer and NaCl processes.
 class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
  public:
   // manifest_url: the URL of the manifest of the Native Client plugin being
   // executed.
@@ skipping 14 matching lines @@
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
 #if defined(OS_WIN)
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
   void OnDebugExceptionHandlerLaunchedByBroker(bool success);
 #endif
 
   bool Send(IPC::Message* msg);
 
  private:
+  friend class PluginListener;
+
   // Internal class that holds the nacl::Handle objecs so that
   // nacl_process_host.h doesn't include NaCl headers.  Needed since it's
   // included by src\content, which can't depend on the NaCl gyp file because it
   // depends on chrome.gyp (circular dependency).
   struct NaClInternal;
 
+  // PluginListener that forwards any messages from untrusted code that aren't
+  // handled by the PepperMessageFilter to us.
+  class PluginListener : public IPC::Listener {
+   public:
+    explicit PluginListener(NaClProcessHost* host);
+    virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+   private:
+    // Non-owning pointer so we can forward messages to the host.
+    NaClProcessHost* host_;
+  };
+
 #if defined(OS_WIN)
   // Create command line for launching loader under nacl-gdb.
   scoped_ptr<CommandLine> GetCommandForLaunchWithGdb(const FilePath& nacl_gdb,
                                                      CommandLine* line);
 #elif defined(OS_LINUX)
   bool LaunchNaClGdb(base::ProcessId pid);
   void OnNaClGdbAttached();
 #endif
   // Get path to manifest on local disk if possible.
   FilePath GetManifestPath();
@@ skipping 27 matching lines @@
   void OnQueryKnownToValidate(const std::string& signature, bool* result);
   void OnSetKnownToValidate(const std::string& signature);
 #if defined(OS_WIN)
   // Message handler for Windows hardware exception handling.
   void OnAttachDebugExceptionHandler(const std::string& info,
                                      IPC::Message* reply_msg);
   bool AttachDebugExceptionHandler(const std::string& info,
                                    IPC::Message* reply_msg);
 #endif
 
+  // Called when a PPAPI IPC channel has been created.
   void OnPpapiChannelCreated(const IPC::ChannelHandle& channel_handle);
+  // Called by PluginListener, so messages from the untrusted side of
+  // the IPC proxy can be handled.
+  bool OnUntrustedMessageForwarded(const IPC::Message& msg);
 
   GURL manifest_url_;
 
 #if defined(OS_WIN)
   // This field becomes true when the broker successfully launched
   // the NaCl loader.
   bool process_launched_by_broker_;
 #elif defined(OS_LINUX)
   bool wait_for_nacl_gdb_;
   MessageLoopForIO::FileDescriptorWatcher nacl_gdb_watcher_;
@@ skipping 25 matching lines @@
 
   scoped_ptr<content::BrowserChildProcessHost> process_;
 
   bool enable_exception_handling_;
   bool enable_debug_stub_;
 
   bool off_the_record_;
 
   bool enable_ipc_proxy_;
 
+  // Channel proxy to terminate the NaCl-Browser PPAPI channel.
+  scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_;
+  // Plugin listener, to forward browser channel messages to us.
+  PluginListener ipc_plugin_listener_;
+
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 #endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_