Mojo: Make bindings_connector_unittest.cc not depend on base.

mojo/public/tests/bindings_connector_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.
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "mojo/public/bindings/lib/bindings_support.h"
 #include "mojo/public/bindings/lib/connector.h"
 #include "mojo/public/bindings/lib/message_queue.h"
+#include "mojo/public/system/macros.h"
 #include "mojo/public/tests/simple_bindings_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {
   }
@@ skipping 15 matching lines @@
   MessageQueue queue_;
 };
 
 class BindingsConnectorTest : public testing::Test {
  public:
   BindingsConnectorTest()
       : handle0_(kInvalidHandle),
         handle1_(kInvalidHandle) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() MOJO_OVERRIDE {
     CreateMessagePipe(&handle0_, &handle1_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() MOJO_OVERRIDE {
     Close(handle0_);
     Close(handle1_);
   }
 
   void AllocMessage(const char* text, Message* message) {
     size_t payload_size = strlen(text) + 1;  // Plus null terminator.
     size_t num_bytes = sizeof(MessageHeader) + payload_size;
     message->data = static_cast<MessageData*>(malloc(num_bytes));
     message->data->header.num_bytes = num_bytes;
     message->data->header.name = 1;
@@ skipping 63 matching lines @@
             std::string(
                 reinterpret_cast<char*>(message_received.data->payload)));
 }
 
 TEST_F(BindingsConnectorTest, Basic_TwoMessages) {
   Connector connector0(handle0_);
   Connector connector1(handle1_);
 
   const char* kText[] = { "hello", "world" };
 
-  for (size_t i = 0; i < arraysize(kText); ++i) {
+  for (size_t i = 0; i < sizeof(kText) / sizeof(kText[0]); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
   MessageAccumulator accumulator;
   connector1.SetIncomingReceiver(&accumulator);
 
   PumpMessages();
 
-  for (size_t i = 0; i < arraysize(kText); ++i) {
+  for (size_t i = 0; i < sizeof(kText) / sizeof(kText[0]); ++i) {
     ASSERT_FALSE(accumulator.IsEmpty());
 
     Message message_received;
     accumulator.Pop(&message_received);
 
     EXPECT_EQ(std::string(kText[i]),
               std::string(
                   reinterpret_cast<char*>(message_received.data->payload)));
   }
 }
@@ skipping 50 matching lines @@
             std::string(
                 reinterpret_cast<char*>(message_received.data->payload)));
   ASSERT_EQ(2U, message_received.handles.size());
   EXPECT_EQ(handles[0].value, message_received.handles[0].value);
   EXPECT_EQ(handles[1].value, message_received.handles[1].value);
 }
 #endif
 
 }  // namespace test
 }  // namespace mojo