Switch to standard integer types in media/.

media/formats/webm/webm_tracks_parser.h

Index: media/formats/webm/webm_tracks_parser.h
diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h
index d5513b520dac0f05a33acba26f6f5474209f5f2a..2f94cfb34cd2081415c3d6cf238d711ea27284d2 100644
--- a/media/formats/webm/webm_tracks_parser.h
+++ b/media/formats/webm/webm_tracks_parser.h
@@ -36,10 +36,10 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
   // Returns -1 if the parse fails.
   // Returns 0 if more data is needed.
   // Returns the number of bytes parsed on success.
-  int Parse(const uint8* buf, int size);
+  int Parse(const uint8_t* buf, int size);
 
-  int64 audio_track_num() const { return audio_track_num_; }
-  int64 video_track_num() const { return video_track_num_; }
+  int64_t audio_track_num() const { return audio_track_num_; }
+  int64_t video_track_num() const { return video_track_num_; }
 
   // If TrackEntry DefaultDuration field existed for the associated audio or
   // video track, returns that value converted from ns to base::TimeDelta with
@@ -50,7 +50,7 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
   base::TimeDelta GetVideoDefaultDuration(
       const double timecode_scale_in_us) const;
 
-  const std::set<int64>& ignored_tracks() const { return ignored_tracks_; }
+  const std::set<int64_t>& ignored_tracks() const { return ignored_tracks_; }
 
   const std::string& audio_encryption_key_id() const {
     return audio_encryption_key_id_;
@@ -78,29 +78,29 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
   // WebMParserClient implementation.
   WebMParserClient* OnListStart(int id) override;
   bool OnListEnd(int id) override;
-  bool OnUInt(int id, int64 val) override;
+  bool OnUInt(int id, int64_t val) override;
   bool OnFloat(int id, double val) override;
-  bool OnBinary(int id, const uint8* data, int size) override;
+  bool OnBinary(int id, const uint8_t* data, int size) override;
   bool OnString(int id, const std::string& str) override;
 
-  int64 track_type_;
-  int64 track_num_;
+  int64_t track_type_;
+  int64_t track_num_;
   std::string track_name_;
   std::string track_language_;
   std::string codec_id_;
-  std::vector<uint8> codec_private_;
-  int64 seek_preroll_;
-  int64 codec_delay_;
-  int64 default_duration_;
+  std::vector<uint8_t> codec_private_;
+  int64_t seek_preroll_;
+  int64_t codec_delay_;
+  int64_t default_duration_;
   scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
 
-  int64 audio_track_num_;
-  int64 audio_default_duration_;
-  int64 video_track_num_;
-  int64 video_default_duration_;
+  int64_t audio_track_num_;
+  int64_t audio_default_duration_;
+  int64_t video_track_num_;
+  int64_t video_default_duration_;
   bool ignore_text_tracks_;
   TextTracks text_tracks_;
-  std::set<int64> ignored_tracks_;
+  std::set<int64_t> ignored_tracks_;
   std::string audio_encryption_key_id_;
   std::string video_encryption_key_id_;
   scoped_refptr<MediaLog> media_log_;