Switch to standard integer types in media/.

media/base/bitstream_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.
 
 #ifndef MEDIA_BASE_BITSTREAM_BUFFER_H_
 #define MEDIA_BASE_BITSTREAM_BUFFER_H_
 
-#include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/time/time.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/media_export.h"
 #include "media/base/timestamp_constants.h"
 
 namespace media {
 
 // Class for passing bitstream buffers around.  Does not take ownership of the
 // data.  This is the media-namespace equivalent of PP_VideoBitstreamBuffer_Dev.
 class MEDIA_EXPORT BitstreamBuffer {
  public:
-  BitstreamBuffer(int32 id, base::SharedMemoryHandle handle, size_t size);
+  BitstreamBuffer(int32_t id, base::SharedMemoryHandle handle, size_t size);
 
-  BitstreamBuffer(int32 id,
+  BitstreamBuffer(int32_t id,
                   base::SharedMemoryHandle handle,
                   size_t size,
                   base::TimeDelta presentation_timestamp);
 
   ~BitstreamBuffer();
 
   void SetDecryptConfig(const DecryptConfig& decrypt_config);
 
-  int32 id() const { return id_; }
+  int32_t id() const { return id_; }
   base::SharedMemoryHandle handle() const { return handle_; }
   size_t size() const { return size_; }
 
   // The timestamp is only valid if it's not equal to |media::kNoTimestamp()|.
   base::TimeDelta presentation_timestamp() const {
     return presentation_timestamp_;
   }
 
   // The following methods come from DecryptConfig.
 
   const std::string& key_id() const { return key_id_; }
   const std::string& iv() const { return iv_; }
   const std::vector<SubsampleEntry>& subsamples() const { return subsamples_; }
 
  private:
-  int32 id_;
+  int32_t id_;
   base::SharedMemoryHandle handle_;
   size_t size_;
 
   // This is only set when necessary. For example, AndroidVideoDecodeAccelerator
   // needs the timestamp because the underlying decoder may require it to
   // determine the output order.
   base::TimeDelta presentation_timestamp_;
 
   // The following fields come from DecryptConfig.
   // TODO(timav): Try to DISALLOW_COPY_AND_ASSIGN and include these params as
   // scoped_ptr<DecryptConfig> or explain why copy & assign is needed.
 
   std::string key_id_;                      // key ID.
   std::string iv_;                          // initialization vector
   std::vector<SubsampleEntry> subsamples_;  // clear/cypher sizes
 
   // Allow compiler-generated copy & assign constructors.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_BITSTREAM_BUFFER_H_