Switch to standard integer types in remoting/.

remoting/base/compound_buffer.h

 // Copyright (c) 2011 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.
 
 // CompoundBuffer implements a data buffer that is composed of several pieces,
 // each stored in a refcounted IOBuffer. It is needed for encoding/decoding
 // video pipeline to represent data packet and minimize data copying.
 // It is particularly useful for splitting data between multiple RTP packets
 // and assembling them into one buffer on the receiving side.
 //
 // CompoundBufferInputStream implements ZeroCopyInputStream interface
 // to be used by protobuf to decode data stored in CompoundBuffer into
 // a protocol buffer message.
 //
 // Mutations to the buffer are not thread-safe. Immutability can be ensured
 // with the Lock() method.
 
 #ifndef REMOTING_BASE_COMPOUND_BUFFER_H_
 #define REMOTING_BASE_COMPOUND_BUFFER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 
 namespace net {
 class IOBuffer;
 class IOBufferWithSize;
 }  // namespace net
 
 namespace remoting {
 
@@ skipping 70 matching lines @@
   // Caller keeps ownership of |buffer|. |buffer| must be locked.
   explicit CompoundBufferInputStream(const CompoundBuffer* buffer);
   ~CompoundBufferInputStream() override;
 
   int position() const { return position_; }
 
   // google::protobuf::io::ZeroCopyInputStream interface.
   bool Next(const void** data, int* size) override;
   void BackUp(int count) override;
   bool Skip(int count) override;
-  int64 ByteCount() const override;
+  int64_t ByteCount() const override;
 
  private:
   const CompoundBuffer* buffer_;
 
   size_t current_chunk_;
   int current_chunk_position_;
   int position_;
   int last_returned_size_;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_COMPOUND_BUFFER_H_