Mojo: Make MessageInTransit more opaque.

mojo/system/raw_channel_posix_unittest.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.
 
 // TODO(vtl): Factor out the remaining POSIX-specific bits of this test (once we
 // have a non-POSIX implementation).
 
 #include "mojo/system/raw_channel.h"
 
 #include <fcntl.h>
@@ skipping 49 matching lines @@
 
 void InitOnIOThread(RawChannel* raw_channel) {
   CHECK(raw_channel->Init());
 }
 
 bool WriteTestMessageToHandle(const embedder::PlatformHandle& handle,
                               uint32_t num_bytes) {
   MessageInTransit* message = MakeTestMessage(num_bytes);
 
   ssize_t write_size = HANDLE_EINTR(
-     write(handle.fd, message, message->size_with_header_and_padding()));
-  bool result = write_size ==
-      static_cast<ssize_t>(message->size_with_header_and_padding());
+     write(handle.fd, message->main_buffer(), message->main_buffer_size()));
+  bool result = write_size == static_cast<ssize_t>(message->main_buffer_size());
   message->Destroy();
   return result;
 }
 
 // -----------------------------------------------------------------------------
 
 class RawChannelPosixTest : public test::TestWithIOThreadBase {
  public:
   RawChannelPosixTest() {}
   virtual ~RawChannelPosixTest() {}
@@ skipping 69 matching lines @@
         CHECK_EQ(reinterpret_cast<size_t>(message) %
                      MessageInTransit::kMessageAlignment, 0u);
 
         if (message->data_size() != expected_size) {
           LOG(ERROR) << "Wrong size: " << message->data_size() << " instead of "
                      << expected_size << " bytes.";
           return false;
         }
 
         // If we've read the whole message....
-        if (bytes_.size() >= message->size_with_header_and_padding()) {
+        if (bytes_.size() >= message->main_buffer_size()) {
           if (!CheckMessageData(message->data(), message->data_size())) {
             LOG(ERROR) << "Incorrect message data.";
             return false;
           }
 
           // Erase message data.
           bytes_.erase(bytes_.begin(),
                        bytes_.begin() +
-                           message->size_with_header_and_padding());
+                           message->main_buffer_size());
           return true;
         }
       }
 
       if (static_cast<size_t>(read_size) < sizeof(buffer)) {
         i++;
         base::PlatformThread::Sleep(
             base::TimeDelta::FromMilliseconds(kMessageReaderSleepMs));
       }
     }
@@ skipping 365 matching lines @@
                         FROM_HERE,
                         base::Bind(&RawChannel::Shutdown,
                                    base::Unretained(rc.get())));
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo