Switch to standard integer types in media/.

media/filters/h264_parser.h

Index: media/filters/h264_parser.h
diff --git a/media/filters/h264_parser.h b/media/filters/h264_parser.h
index 389fe0d163cf63a11c474952f5638c800cecef2b..7aec208420bebe2339906622d01408b1c552f744 100644
--- a/media/filters/h264_parser.h
+++ b/media/filters/h264_parser.h
@@ -12,7 +12,6 @@
 #include <map>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "media/base/media_export.h"
 #include "media/base/ranges.h"
 #include "media/filters/h264_bit_reader.h"
@@ -52,7 +51,7 @@ struct MEDIA_EXPORT H264NALU {
 
   // After (without) start code; we don't own the underlying memory
   // and a shallow copy should be made when copying this struct.
-  const uint8* data;
+  const uint8_t* data;
   off_t size;  // From after start code to start code of next NALU (or EOS).
 
   int nal_ref_idc;
@@ -235,7 +234,7 @@ struct MEDIA_EXPORT H264SliceHeader {
 
   bool idr_pic_flag;       // from NAL header
   int nal_ref_idc;         // from NAL header
-  const uint8* nalu_data;  // from NAL header
+  const uint8_t* nalu_data;  // from NAL header
   off_t nalu_size;         // from NAL header
   off_t header_bit_size;   // calculated
 
@@ -338,15 +337,19 @@ class MEDIA_EXPORT H264Parser {
   // - |*offset| is between 0 and |data_size| included.
   //   It is strictly less than |data_size| if |data_size| > 0.
   // - |*start_code_size| is either 0, 3 or 4.
-  static bool FindStartCode(const uint8* data, off_t data_size,
-                            off_t* offset, off_t* start_code_size);
+  static bool FindStartCode(const uint8_t* data,
+                            off_t data_size,
+                            off_t* offset,
+                            off_t* start_code_size);
 
   // Wrapper for FindStartCode() that skips over start codes that
   // may appear inside of |encrypted_ranges_|.
   // Returns true if a start code was found. Otherwise returns false.
-  static bool FindStartCodeInClearRanges(const uint8* data, off_t data_size,
-                                         const Ranges<const uint8*>& ranges,
-                                         off_t* offset, off_t* start_code_size);
+  static bool FindStartCodeInClearRanges(const uint8_t* data,
+                                         off_t data_size,
+                                         const Ranges<const uint8_t*>& ranges,
+                                         off_t* offset,
+                                         off_t* start_code_size);
   H264Parser();
   ~H264Parser();
 
@@ -355,8 +358,9 @@ class MEDIA_EXPORT H264Parser {
   // |stream| owned by caller.
   // |subsamples| contains information about what parts of |stream| are
   // encrypted.
-  void SetStream(const uint8* stream, off_t stream_size);
-  void SetEncryptedStream(const uint8* stream, off_t stream_size,
+  void SetStream(const uint8_t* stream, off_t stream_size);
+  void SetEncryptedStream(const uint8_t* stream,
+                          off_t stream_size,
                           const std::vector<SubsampleEntry>& subsamples);
 
   // Read the stream to find the next NALU, identify it and return
@@ -448,7 +452,7 @@ class MEDIA_EXPORT H264Parser {
   Result ParseDecRefPicMarking(H264SliceHeader* shdr);
 
   // Pointer to the current NALU in the stream.
-  const uint8* stream_;
+  const uint8_t* stream_;
 
   // Bytes left in the stream after the current NALU.
   off_t bytes_left_;
@@ -463,7 +467,7 @@ class MEDIA_EXPORT H264Parser {
 
   // Ranges of encrypted bytes in the buffer passed to
   // SetEncryptedStream().
-  Ranges<const uint8*> encrypted_ranges_;
+  Ranges<const uint8_t*> encrypted_ranges_;
 
   DISALLOW_COPY_AND_ASSIGN(H264Parser);
 };