Switch to standard integer types in google_apis/.

google_apis/gcm/engine/connection_handler_impl_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/engine/connection_handler_impl.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/wire_format_lite.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/base/socket_stream.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/stream_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 namespace {
 
 typedef scoped_ptr<google::protobuf::MessageLite> ScopedMessage;
 typedef std::vector<net::MockRead> ReadList;
 typedef std::vector<net::MockWrite> WriteList;
 
-const uint64 kAuthId = 54321;
-const uint64 kAuthToken = 12345;
+const uint64_t kAuthId = 54321;
+const uint64_t kAuthToken = 12345;
 const char kMCSVersion = 41;  // The protocol version.
 const int kMCSPort = 5228;    // The server port.
 const char kDataMsgFrom[] = "data_from";
 const char kDataMsgCategory[] = "data_category";
 const char kDataMsgFrom2[] = "data_from2";
 const char kDataMsgCategory2[] = "data_category2";
 const char kDataMsgFromLong[] =
     "this is a long from that will result in a message > 128 bytes";
 const char kDataMsgCategoryLong[] =
     "this is a long category that will result in a message > 128 bytes";
 const char kDataMsgFromLong2[] =
     "this is a second long from that will result in a message > 128 bytes";
 const char kDataMsgCategoryLong2[] =
     "this is a second long category that will result in a message > 128 bytes";
-const uint8 kInvalidTag = 100;  // An invalid tag.
+const uint8_t kInvalidTag = 100;  // An invalid tag.
 
 // ---- Helpers for building messages. ----
 
 // Encode a protobuf packet with protobuf type |tag| and serialized protobuf
 // bytes |proto| into the MCS message form (tag + varint size + bytes).
-std::string EncodePacket(uint8 tag, const std::string& proto) {
+std::string EncodePacket(uint8_t tag, const std::string& proto) {
   std::string result;
   google::protobuf::io::StringOutputStream string_output_stream(&result);
   {
     google::protobuf::io::CodedOutputStream coded_output_stream(
       &string_output_stream);
     const unsigned char tag_byte[1] = { tag };
     coded_output_stream.WriteRaw(tag_byte, 1);
     coded_output_stream.WriteVarint32(proto.size());
     coded_output_stream.WriteRaw(proto.c_str(), proto.size());
     // ~CodedOutputStream must run before the move constructor at the
@@ skipping 836 matching lines @@
   WaitForMessage();  // The login send.
   WaitForMessage();  // The login response.
   received_message.reset();
   WaitForMessage();  // The invalid message.
   EXPECT_FALSE(received_message.get());
   EXPECT_EQ(net::ERR_FAILED, last_error());
 }
 
 }  // namespace
 }  // namespace gcm