Switch to standard integer types in google_apis/.

google_apis/gcm/base/socket_stream.h

 // 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.
 //
 // Protobuf ZeroCopy[Input/Output]Stream implementations capable of using a
 // net::StreamSocket. Built to work with Protobuf CodedStreams.
 
 #ifndef GOOGLE_APIS_GCM_BASE_SOCKET_STREAM_H_
 #define GOOGLE_APIS_GCM_BASE_SOCKET_STREAM_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 class DrainableIOBuffer;
 class IOBuffer;
 class StreamSocket;
@@ skipping 38 matching lines @@
   };
 
   // |socket| should already be connected.
   explicit SocketInputStream(net::StreamSocket* socket);
   ~SocketInputStream() override;
 
   // ZeroCopyInputStream implementation.
   bool Next(const void** data, int* size) override;
   void BackUp(int count) override;
   bool Skip(int count) override;  // Not implemented.
-  int64 ByteCount() const override;
+  int64_t ByteCount() const override;
 
   // The remaining amount of valid data available to be read.
   int UnreadByteCount() const;
 
   // Reads from the socket, appending a max of |byte_limit| bytes onto the read
   // buffer. net::ERR_IO_PENDING is returned if the refresh can't complete
   // synchronously, in which case the callback is invoked upon completion. If
   // the refresh can complete synchronously, even in case of an error, returns
   // net::OK without invoking callback.
   // Note: GetState() (and possibly last_error()) should be checked upon
@@ skipping 74 matching lines @@
     CLOSED,
   };
 
   // |socket| should already be connected.
   explicit SocketOutputStream(net::StreamSocket* socket);
   ~SocketOutputStream() override;
 
   // ZeroCopyOutputStream implementation.
   bool Next(void** data, int* size) override;
   void BackUp(int count) override;
-  int64 ByteCount() const override;
+  int64_t ByteCount() const override;
 
   // Writes the buffer into the Socket.
   net::Error Flush(const base::Closure& callback);
 
   // Returns the last fatal error encountered. Only valid if GetState() ==
   // CLOSED.
   net::Error last_error() const;
 
   // Returns the current state.
   State GetState() const;
@@ skipping 18 matching lines @@
   net::Error last_error_;
 
   base::WeakPtrFactory<SocketOutputStream> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketOutputStream);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_BASE_SOCKET_STREAM_H_