Switch to standard integer types in google_apis/.

google_apis/gcm/base/socket_stream_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 "google_apis/gcm/base/socket_stream.h"
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 namespace {
 
 typedef std::vector<net::MockRead> ReadList;
@@ skipping 87 matching lines @@
   const void* buffer = NULL;
   int size = 0;
 
   do {
     DCHECK(socket_input_stream_->GetState() == SocketInputStream::EMPTY ||
            socket_input_stream_->GetState() == SocketInputStream::READY);
     if (!socket_input_stream_->Next(&buffer, &size))
       break;
     total_bytes_read += size;
     if (initial_buffer) {  // Verify the buffer doesn't skip data.
-      EXPECT_EQ(static_cast<const uint8*>(initial_buffer) + total_bytes_read,
-                static_cast<const uint8*>(buffer) + size);
+      EXPECT_EQ(static_cast<const uint8_t*>(initial_buffer) + total_bytes_read,
+                static_cast<const uint8_t*>(buffer) + size);
     } else {
       initial_buffer = buffer;
     }
   } while (total_bytes_read < bytes);
 
   if (total_bytes_read > bytes) {
     socket_input_stream_->BackUp(total_bytes_read - bytes);
     total_bytes_read = bytes;
   }
 
@@ skipping 261 matching lines @@
 TEST_F(GCMSocketStreamTest, WriteDisconnected) {
   BuildSocket(ReadList(), WriteList());
   socket()->Disconnect();
   DoOutputStreamWrite(base::StringPiece(kWriteData, kWriteDataSize));
   ASSERT_EQ(SocketOutputStream::CLOSED, output_stream()->GetState());
   ASSERT_EQ(net::ERR_CONNECTION_CLOSED, output_stream()->last_error());
 }
 
 }  // namespace
 }  // namespace gcm