Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

ipc/mojo/ipc_channel_mojo.h

 // Copyright 2014 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 IPC_IPC_CHANNEL_MOJO_H_
 #define IPC_IPC_CHANNEL_MOJO_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_factory.h"
 #include "ipc/ipc_export.h"
 #include "ipc/mojo/ipc_message_pipe_reader.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
+#include "ipc/mojo/scoped_ipc_support.h"
 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/core.h"
 
 namespace IPC {
 
 // Mojo-based IPC::Channel implementation over a platform handle.
 //
 // ChannelMojo builds Mojo MessagePipe using underlying pipe given by
 // "bootstrap" IPC::Channel which creates and owns platform pipe like
 // named socket. The bootstrap Channel is used only for establishing
@@ skipping 40 matching lines @@
                                         Listener* listener);
 
   // Create a factory object for ChannelMojo.
   // The factory is used to create Mojo-based ChannelProxy family.
   // |host| must not be null.
   static scoped_ptr<ChannelFactory> CreateServerFactory(
       Delegate* delegate,
       const ChannelHandle& channel_handle);
 
   static scoped_ptr<ChannelFactory> CreateClientFactory(
+      Delegate* delegate,
       const ChannelHandle& channel_handle);
 
   ~ChannelMojo() override;
 
   // ChannelMojoHost tells the client handle using this API.
   void OnClientLaunched(base::ProcessHandle handle);
 
   // Channel implementation
   bool Connect() override;
   void Close() override;
@@ skipping 52 matching lines @@
   base::WeakPtr<Delegate> delegate_;
   Mode mode_;
   Listener* listener_;
   base::ProcessId peer_pid_;
   scoped_ptr<mojo::embedder::ChannelInfo,
              ChannelInfoDeleter> channel_info_;
 
   scoped_ptr<internal::MessagePipeReader, ReaderDeleter> message_reader_;
   ScopedVector<Message> pending_messages_;
 
+  scoped_ptr<ScopedIPCSupport> ipc_support_;
+
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_