Refactoring: Split NaClListener into two delegated classes.

components/nacl/loader/nacl_trusted_listener.cc

Index: components/nacl/loader/nacl_trusted_listener.cc
diff --git a/components/nacl/loader/nacl_trusted_listener.cc b/components/nacl/loader/nacl_trusted_listener.cc
index 5f6410a83f0f14632fe05166d209d17b07ed7a3c..125f146c3352d0dae76b3cd448c2ddf865b2ea7b 100644
--- a/components/nacl/loader/nacl_trusted_listener.cc
+++ b/components/nacl/loader/nacl_trusted_listener.cc
@@ -8,22 +8,23 @@
 
 NaClTrustedListener::NaClTrustedListener(
     const IPC::ChannelHandle& handle,
-    base::SingleThreadTaskRunner* ipc_task_runner) {
-  channel_proxy_ = IPC::ChannelProxy::Create(
-      handle,
-      IPC::Channel::MODE_SERVER,
-      this,
-      ipc_task_runner).Pass();
+    base::SingleThreadTaskRunner* ipc_task_runner)
+    : channel_handle_(handle),
+      channel_proxy_(IPC::ChannelProxy::Create(
+          handle, IPC::Channel::MODE_SERVER, this, ipc_task_runner)) {
 }
 
 NaClTrustedListener::~NaClTrustedListener() {
 }
 
+IPC::ChannelHandle NaClTrustedListener::TakeClientChannelHandle() {
+  IPC::ChannelHandle handle = channel_handle_;
 #if defined(OS_POSIX)
-int NaClTrustedListener::TakeClientFileDescriptor() {
-  return channel_proxy_->TakeClientFileDescriptor();
-}
+  handle.socket =
+      base::FileDescriptor(channel_proxy_->TakeClientFileDescriptor(), true);
 #endif
+  return handle;
+}
 
 bool NaClTrustedListener::OnMessageReceived(const IPC::Message& msg) {
   return false;