Add an IPC channel between the NaCl loader process and the renderer.

chrome/browser/nacl_host/nacl_process_host.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 "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 391 matching lines @@
 
 void NaClProcessHost::DebugContext::StopThread() {
   thread_->Stop();
   thread_.reset();
 }
 #endif
 
 struct NaClProcessHost::NaClInternal {
   std::vector<nacl::Handle> sockets_for_renderer;
   std::vector<nacl::Handle> sockets_for_sel_ldr;
+  std::string channel_name;

[Mark Seaborn, 2012/04/25 00:40:39]

This doesn't need to go in NaClInternal.  You can put it directly in
NaClProcessHost.

The header says:

  // 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;

[bbudge, 2012/04/25 00:50:04]

Yes, I'll remove it from this struct.

 };
 
 // -----------------------------------------------------------------------------
 
 NaClProcessHost::NaClProcessHost(const GURL& manifest_url)
     : manifest_url_(manifest_url),
 #if defined(OS_WIN)
       process_launched_by_broker_(false),
 #elif defined(OS_LINUX)
       wait_for_nacl_gdb_(false),
@@ skipping 87 matching lines @@
   }
 
   // Start getting the IRT open asynchronously while we launch the NaCl process.
   // We'll make sure this actually finished in StartWithLaunchedProcess, below.
   if (!NaClBrowser::GetInstance()->EnsureIrtAvailable()) {
     DLOG(ERROR) << "Cannot launch NaCl process after IRT file open failed";
     delete this;
     return;
   }
 
+  internal_->channel_name =
+      IPC::Channel::GenerateVerifiedChannelID(std::string());

[bbudge, 2012/04/25 00:50:04]

This bit of code doesn't seem to work, in that the named pipe (on Windows) can't
be created in nacl_listener. Experimenting, I mimicked the name that nacl_imc
uses for it's socket pairs and that worked. It's surprising that this should be
sensitive to the name string.

+
   // Rather than creating a socket pair in the renderer, and passing
   // one side through the browser to sel_ldr, socket pairs are created
   // in the browser and then passed to the renderer and sel_ldr.
   //
   // This is mainly for the benefit of Windows, where sockets cannot
   // be passed in messages, but are copied via DuplicateHandle().
   // This means the sandboxed renderer cannot send handles to the
   // browser process.
 
   for (int i = 0; i < socket_count; i++) {
@@ skipping 423 matching lines @@
   chrome_render_message_filter_ = NULL;
   reply_msg_ = NULL;
   internal_->sockets_for_renderer.clear();
   return true;
 }
 
 bool NaClProcessHost::StartNaClExecution() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
 
   nacl::NaClStartParams params;
+  params.channel_name = internal_->channel_name;
   params.validation_cache_key = nacl_browser->GetValidatorCacheKey();
   params.version = chrome::VersionInfo().CreateVersionString();
   params.enable_exception_handling = enable_exception_handling_;
 
   base::PlatformFile irt_file = nacl_browser->IrtFile();
   CHECK_NE(irt_file, base::kInvalidPlatformFileValue);
 
   const ChildProcessData& data = process_->GetData();
   for (size_t i = 0; i < internal_->sockets_for_sel_ldr.size(); i++) {
     if (!ShareHandleToSelLdr(data.handle,
@@ skipping 73 matching lines @@
 }
 
 void NaClProcessHost::OnQueryKnownToValidate(const std::string& signature,
                                              bool* result) {
   *result = NaClBrowser::GetInstance()->QueryKnownToValidate(signature);
 }
 
 void NaClProcessHost::OnSetKnownToValidate(const std::string& signature) {
   NaClBrowser::GetInstance()->SetKnownToValidate(signature);
 }