Switch to standard integer types in media/.

media/formats/webm/tracks_builder.h

Index: media/formats/webm/tracks_builder.h
diff --git a/media/formats/webm/tracks_builder.h b/media/formats/webm/tracks_builder.h
index f7786fd70fb7a8bb608328359a8de4c74ca62856..dc0283e310d41194095e3ef6dbc49aa0d5814117 100644
--- a/media/formats/webm/tracks_builder.h
+++ b/media/formats/webm/tracks_builder.h
@@ -5,11 +5,13 @@
 #ifndef MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 #define MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 
+#include <stdint.h>
+
 #include <list>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace media {
 
@@ -28,7 +30,7 @@ class TracksBuilder {
   // DefaultDuration. Similar applies to |audio_channels|,
   // |audio_sampling_frequency|, |video_pixel_width| and |video_pixel_height|.
   void AddVideoTrack(int track_num,
-                     uint64 track_uid,
+                     uint64_t track_uid,
                      const std::string& codec_id,
                      const std::string& name,
                      const std::string& language,
@@ -36,7 +38,7 @@ class TracksBuilder {
                      int video_pixel_width,
                      int video_pixel_height);
   void AddAudioTrack(int track_num,
-                     uint64 track_uid,
+                     uint64_t track_uid,
                      const std::string& codec_id,
                      const std::string& name,
                      const std::string& language,
@@ -44,17 +46,17 @@ class TracksBuilder {
                      int audio_channels,
                      double audio_sampling_frequency);
   void AddTextTrack(int track_num,
-                    uint64 track_uid,
+                    uint64_t track_uid,
                     const std::string& codec_id,
                     const std::string& name,
                     const std::string& language);
 
-  std::vector<uint8> Finish();
+  std::vector<uint8_t> Finish();
 
  private:
   void AddTrackInternal(int track_num,
                         int track_type,
-                        uint64 track_uid,
+                        uint64_t track_uid,
                         const std::string& codec_id,
                         const std::string& name,
                         const std::string& language,
@@ -65,13 +67,13 @@ class TracksBuilder {
                         double audio_sampling_frequency);
   int GetTracksSize() const;
   int GetTracksPayloadSize() const;
-  void WriteTracks(uint8* buffer, int buffer_size) const;
+  void WriteTracks(uint8_t* buffer, int buffer_size) const;
 
   class Track {
    public:
     Track(int track_num,
           int track_type,
-          uint64 track_uid,
+          uint64_t track_uid,
           const std::string& codec_id,
           const std::string& name,
           const std::string& language,
@@ -83,7 +85,8 @@ class TracksBuilder {
           bool allow_invalid_values);
 
     int GetSize() const;
-    void Write(uint8** buf, int* buf_size) const;
+    void Write(uint8_t** buf, int* buf_size) const;
+
    private:
     int GetPayloadSize() const;
     int GetVideoPayloadSize() const;