Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/edk/system/remote_message_pipe_unittest.cc

 // 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.
 
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <vector>
 
@@ skipping 313 matching lines @@
   scoped_refptr<MessagePipe> mp1(MessagePipe::CreateProxyLocal(&ep1));
   BootstrapChannelEndpoints(ep0, ep1);
 
   // Now put another message pipe on the channel.
 
   // Do this by creating a message pipe (for the |channels(0)| side) and
   // attaching and running it, yielding the remote ID. A message is then sent
   // via |ep0| (i.e., sent using |mp0|, port 0) with this remote ID. Upon
   // receiving this message, |PassIncomingMessagePipe()| is used to obtain the
   // message pipe on the other side.
-  scoped_refptr<ChannelEndpoint> ep2;
-  scoped_refptr<MessagePipe> mp2(MessagePipe::CreateLocalProxy(&ep2));
+  scoped_refptr<MessagePipe> mp2(MessagePipe::CreateLocalLocal());
   ASSERT_TRUE(channels(0));
-  size_t endpoint_info_size = channels(0)->GetSerializedEndpointSize();
-  scoped_ptr<char[]> endpoint_info(new char[endpoint_info_size]);
-  channels(0)->SerializeEndpoint(ep2, endpoint_info.get());
+  size_t max_endpoint_info_size;
+  size_t max_platform_handle_count;
+  mp2->StartSerialize(1, channels(0), &max_endpoint_info_size,
+                      &max_platform_handle_count);
+  EXPECT_GT(max_endpoint_info_size, 0u);
+  ASSERT_EQ(0u, max_platform_handle_count);
+  scoped_ptr<char[]> endpoint_info(new char[max_endpoint_info_size]);
+  size_t endpoint_info_size;
+  mp2->EndSerialize(1, channels(0), endpoint_info.get(), &endpoint_info_size,
+                    nullptr);
+  EXPECT_EQ(max_endpoint_info_size, endpoint_info_size);
 
   waiter.Init();
   ASSERT_EQ(
       MOJO_RESULT_OK,
       mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr));
 
   EXPECT_EQ(MOJO_RESULT_OK,
             mp0->WriteMessage(0, UserPointer<const void>(endpoint_info.get()),
                               static_cast<uint32_t>(endpoint_info_size),
                               nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
@@ skipping 1010 matching lines @@
   mp0->Close(0);
   mp1->Close(1);
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
   // Note that |local_mp|'s port 0 belong to |dispatcher|, which was closed.
   local_mp->Close(1);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo