Merge NaClIPCAdapter::set_resolve_file_token_callback() into the constructor

components/nacl/loader/nacl_listener.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_listener.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 121 matching lines @@
   g_listener->Send(new NaClProcessHostMsg_DebugStubPortSelected(port));
 }
 
 #endif
 
 // Creates the PPAPI IPC channel between the NaCl IRT and the host
 // (browser/renderer) process, and starts to listen it on the thread where
 // the given message_loop_proxy runs.
 // Also, creates and sets the corresponding NaClDesc to the given nap with
 // the FD #.
 scoped_refptr<NaClIPCAdapter> SetUpIPCAdapter(

[Mark Seaborn, 2015/04/16 20:51:21]

You can change this to return 'void' now.

[Yusuke Sato, 2015/04/16 21:25:02]

Done.

     IPC::ChannelHandle* handle,
     scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
     struct NaClApp* nap,
-    int nacl_fd) {
+    int nacl_fd,
+    NaClIPCAdapter::ResolveFileTokenCallback resolve_file_token_cb) {
   scoped_refptr<NaClIPCAdapter> ipc_adapter(
-      new NaClIPCAdapter(*handle, message_loop_proxy.get()));
+      new NaClIPCAdapter(*handle,
+                         message_loop_proxy.get(),
+                         resolve_file_token_cb));
   ipc_adapter->ConnectChannel();
 #if defined(OS_POSIX)
   handle->socket =
       base::FileDescriptor(ipc_adapter->TakeClientFileDescriptor());
 #endif
 
   // Pass a NaClDesc to the untrusted side. This will hold a ref to the
   // NaClIPCAdapter.
   NaClAppSetDesc(nap, nacl_fd, ipc_adapter->MakeNaClDesc());
   return ipc_adapter;
@@ skipping 145 matching lines @@
 
   if (params.enable_ipc_proxy) {
     browser_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
     ppapi_renderer_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
     manifest_service_handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
 
     // Create the PPAPI IPC channels between the NaCl IRT and the host
     // (browser/renderer) processes. The IRT uses these channels to
     // communicate with the host and to initialize the IPC dispatchers.
     SetUpIPCAdapter(&browser_handle, io_thread_.message_loop_proxy(),
-                    nap, NACL_CHROME_DESC_BASE);
+                    nap, NACL_CHROME_DESC_BASE,
+                    NaClIPCAdapter::ResolveFileTokenCallback());
     SetUpIPCAdapter(&ppapi_renderer_handle, io_thread_.message_loop_proxy(),
-                    nap, NACL_CHROME_DESC_BASE + 1);
-
-    scoped_refptr<NaClIPCAdapter> manifest_ipc_adapter =
-        SetUpIPCAdapter(&manifest_service_handle,
-                        io_thread_.message_loop_proxy(),
-                        nap,
-                        NACL_CHROME_DESC_BASE + 2);
-    manifest_ipc_adapter->set_resolve_file_token_callback(
-        base::Bind(&NaClListener::ResolveFileToken, base::Unretained(this)));
+                    nap, NACL_CHROME_DESC_BASE + 1,
+                    NaClIPCAdapter::ResolveFileTokenCallback());
+    SetUpIPCAdapter(&manifest_service_handle,
+                    io_thread_.message_loop_proxy(),
+                    nap,
+                    NACL_CHROME_DESC_BASE + 2,
+                    base::Bind(&NaClListener::ResolveFileToken,
+                               base::Unretained(this)));
   }
 
   trusted_listener_ = new NaClTrustedListener(
       IPC::Channel::GenerateVerifiedChannelID("nacl"),
       io_thread_.message_loop_proxy().get(),
       &shutdown_event_);
   if (!Send(new NaClProcessHostMsg_PpapiChannelsCreated(
           browser_handle,
           ppapi_renderer_handle,
           trusted_listener_->TakeClientChannelHandle(),
@@ skipping 127 matching lines @@
 }
 
 void NaClListener::OnFileTokenResolved(
     uint64_t token_lo,
     uint64_t token_hi,
     IPC::PlatformFileForTransit ipc_fd,
     base::FilePath file_path) {
   resolved_cb_.Run(ipc_fd, file_path);
   resolved_cb_.Reset();
 }