Create IPC channel to communicate with the renderer in NaClListener::OnStart().

components/nacl/loader/nacl_ipc_adapter.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include "base/basictypes.h"
@@ skipping 487 matching lines @@
         case ppapi::proxy::SerializedHandle::SOCKET: {
           nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake(
 #if defined(OS_WIN)
               iter->descriptor()
 #else
               iter->descriptor().fd
 #endif
           )));
           break;
         }
-        case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE: {
-          // Check that this came from a PpapiMsg_CreateNaClChannel message.
-          // This code here is only appropriate for that message.
-          DCHECK(msg.type() == PpapiMsg_CreateNaClChannel::ID);
-          IPC::ChannelHandle channel_handle =
-              IPC::Channel::GenerateVerifiedChannelID("nacl");
-          scoped_refptr<NaClIPCAdapter> ipc_adapter(
-              new NaClIPCAdapter(channel_handle, task_runner_.get()));
-          ipc_adapter->ConnectChannel();
-#if defined(OS_POSIX)
-          channel_handle.socket = base::FileDescriptor(
-              ipc_adapter->TakeClientFileDescriptor(), true);
-#endif
-          nacl_desc.reset(new NaClDescWrapper(ipc_adapter->MakeNaClDesc()));
-          // Send back a message that the channel was created.
-          scoped_ptr<IPC::Message> response(
-              new PpapiHostMsg_NaClChannelCreated(channel_handle));
-          task_runner_->PostTask(FROM_HERE,
-              base::Bind(&NaClIPCAdapter::SendMessageOnIOThread, this,
-                         base::Passed(&response)));
-          break;
-        }
         case ppapi::proxy::SerializedHandle::FILE: {
           // Create the NaClDesc for the file descriptor. If quota checking is
           // required, wrap it in a NaClDescQuota.
           NaClDesc* desc = NaClDescIoDescFromHandleAllocCtor(
 #if defined(OS_WIN)
               iter->descriptor(),
 #else
               iter->descriptor().fd,
 #endif
               TranslatePepperFileReadWriteOpenFlags(iter->open_flags()));
           if (desc && iter->file_io()) {
             desc = MakeNaClDescQuota(
                 locked_data_.nacl_msg_scanner_.GetFile(iter->file_io()),
                 desc);
           }
           if (desc)
             nacl_desc.reset(new NaClDescWrapper(desc));
           break;
         }
 
+        case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE:

[Mark Seaborn, 2014/02/04 19:28:12]

Should we also remove the definition of CHANNEL_HANDLE from the enum in
ppapi/proxy/serialized_handle.h?

[hidehiko, 2014/02/05 06:30:16]

Done.

         case ppapi::proxy::SerializedHandle::INVALID: {
           // Nothing to do. TODO(dmichael): Should we log this? Or is it
           // sometimes okay to pass an INVALID handle?
           break;
         }
         // No default, so the compiler will warn us if new types get added.
       }
       if (nacl_desc.get())
         rewritten_msg->AddDescriptor(nacl_desc.release());
     }
@@ skipping 127 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<int>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }