Switch to standard integer types in google_apis/.

google_apis/gcm/base/socket_stream.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 <stddef.h>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "net/base/io_buffer.h"
 #include "net/socket/stream_socket.h"
 
 namespace gcm {
 
 namespace {
 
 // TODO(zea): consider having dynamically-sized buffers if this becomes too
@@ skipping 47 matching lines @@
   DVLOG(1) << "Backing up " << count << " bytes in input buffer. "
            << "Current position now at " << next_pos_
            << " of " << read_buffer_->BytesConsumed();
 }
 
 bool SocketInputStream::Skip(int count) {
   NOTIMPLEMENTED();
   return false;
 }
 
-int64 SocketInputStream::ByteCount() const {
+int64_t SocketInputStream::ByteCount() const {
   DCHECK_NE(GetState(), CLOSED);
   DCHECK_NE(GetState(), READING);
   return next_pos_;
 }
 
 int SocketInputStream::UnreadByteCount() const {
   DCHECK_NE(GetState(), CLOSED);
   DCHECK_NE(GetState(), READING);
   return read_buffer_->BytesConsumed() - next_pos_;
 }
@@ skipping 153 matching lines @@
 
 void SocketOutputStream::BackUp(int count) {
   DCHECK_GE(count, 0);
   if (count > next_pos_)
     next_pos_ = 0;
   next_pos_ -= count;
   DVLOG(1) << "Backing up " << count << " bytes in output buffer. "
            << next_pos_ << " bytes used.";
 }
 
-int64 SocketOutputStream::ByteCount() const {
+int64_t SocketOutputStream::ByteCount() const {
   DCHECK_NE(GetState(), CLOSED);
   DCHECK_NE(GetState(), FLUSHING);
   return next_pos_;
 }
 
 net::Error SocketOutputStream::Flush(const base::Closure& callback) {
   DCHECK_EQ(GetState(), READY);
 
   if (!socket_->IsConnected()) {
     LOG(ERROR) << "Socket was disconnected, closing output stream";
@@ skipping 69 matching lines @@
   }
 
   DVLOG(1) << "Socket flush complete.";
   write_buffer_->SetOffset(0);
   next_pos_ = 0;
   if (!callback.is_null())
     callback.Run();
 }
 
 }  // namespace gcm