Merge NaClIPCAdapter::set_resolve_file_token_callback() into the constructor

components/nacl/loader/nacl_ipc_adapter.cc

Index: components/nacl/loader/nacl_ipc_adapter.cc
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index 5df92fbe6adb4ef6e1bcf56b2bba334f19bc1469..c3a4f133f3b9ef66e4b89a8792da6a83c0e1ef7c 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -325,10 +325,12 @@ NaClIPCAdapter::IOThreadData::~IOThreadData() {
 }
 
 NaClIPCAdapter::NaClIPCAdapter(const IPC::ChannelHandle& handle,
-                               base::TaskRunner* runner)
+                               base::TaskRunner* runner,
+                               ResolveFileTokenCallback resolve_file_token_cb)
     : lock_(),
       cond_var_(&lock_),
       task_runner_(runner),
+      resolve_file_token_cb_(resolve_file_token_cb),
       locked_data_() {
   io_thread_data_.channel_ = IPC::Channel::CreateServer(handle, this);
   // Note, we can not PostTask for ConnectChannelOnIOThread here. If we did,