Merge NaClIPCAdapter::set_resolve_file_token_callback() into the constructor

components/nacl/loader/nacl_ipc_adapter.h

 // 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.
 
 #ifndef CHROME_NACL_NACL_IPC_ADAPTER_H_
 #define CHROME_NACL_NACL_IPC_ADAPTER_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 54 matching lines @@
 #pragma pack(push, 4)
   struct NaClMessageHeader : public Pickle::Header {
     int32 routing;
     uint32 type;
     uint32 flags;
     uint16 num_fds;
     uint16 pad;
   };
 #pragma pack(pop)
 
+  typedef base::Callback<void(IPC::PlatformFileForTransit, base::FilePath)>
+      ResolveFileTokenReplyCallback;
+
+  typedef base::Callback<void(uint64_t,  // file_token_lo
+                              uint64_t,  // file_token_hi
+                              ResolveFileTokenReplyCallback)>
+      ResolveFileTokenCallback;
+
   // Creates an adapter, using the thread associated with the given task
   // runner for posting messages. In normal use, the task runner will post to
   // the I/O thread of the process.
   //
   // If you use this constructor, you MUST call ConnectChannel after the
   // NaClIPCAdapter is constructed, or the NaClIPCAdapter's channel will not be
   // connected.
-  NaClIPCAdapter(const IPC::ChannelHandle& handle, base::TaskRunner* runner);
+  //
+  // |resolve_file_token_cb| is a callback to be invoked for resolving file

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

Maybe say "optional callback"?

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

Done.

+  // tokens received from the renderer. When the file token is resolved, the
+  // ResolveFileTokenReplyCallback passed inside the ResolveFileTokenCallback
+  // will be invoked.
+  NaClIPCAdapter(
+      const IPC::ChannelHandle& handle,
+      base::TaskRunner* runner,
+      ResolveFileTokenCallback resolve_file_token_cb);
 
   // Initializes with a given channel that's already created for testing
   // purposes. This function will take ownership of the given channel.
   NaClIPCAdapter(scoped_ptr<IPC::Channel> channel, base::TaskRunner* runner);
 
   // Connect the channel. This must be called after the constructor that accepts
   // an IPC::ChannelHandle, and causes the Channel to be connected on the IO
   // thread.
   void ConnectChannel();
 
@@ skipping 15 matching lines @@
 
 #if defined(OS_POSIX)
   base::ScopedFD TakeClientFileDescriptor();
 #endif
 
   // Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnChannelConnected(int32 peer_pid) override;
   void OnChannelError() override;
 
-  typedef base::Callback<void(IPC::PlatformFileForTransit, base::FilePath)>
-      ResolveFileTokenReplyCallback;
-
-  typedef base::Callback<void(uint64_t,  // file_token_lo
-                              uint64_t,  // file_token_hi
-                              ResolveFileTokenReplyCallback)>
-      ResolveFileTokenCallback;
-
-  // Sets a callback to be invoked for resolving file tokens received from the
-  // renderer. When the file token is resolved, the
-  // ResolveFileTokenReplyCallback passed inside the ResolveFileTokenCallback
-  // will be invoked.
-  void set_resolve_file_token_callback(ResolveFileTokenCallback cb) {
-    resolve_file_token_cb_ = cb;
-  }
-
  private:
   friend class base::RefCountedThreadSafe<NaClIPCAdapter>;
 
   class RewrittenMessage;
 
   // This is the data that must only be accessed inside the lock. This struct
   // just separates it so it's easier to see.
   struct LockedData {
     LockedData();
     ~LockedData();
@@ skipping 72 matching lines @@
   // To be accessed on the I/O thread (via task runner) only.
   IOThreadData io_thread_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClIPCAdapter);
 };
 
 // Export TranslatePepperFileReadWriteOpenFlags for testing.
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags);
 
 #endif  // CHROME_NACL_NACL_IPC_ADAPTER_H_