| Index: media/base/bit_reader.h
 | 
| diff --git a/media/base/bit_reader.h b/media/base/bit_reader.h
 | 
| index fda854162a64f23478302625af58c8f39dbe8dba..0dcd895786da817a00f4c9815a4ad4816429f15f 100644
 | 
| --- a/media/base/bit_reader.h
 | 
| +++ b/media/base/bit_reader.h
 | 
| @@ -5,7 +5,6 @@
 | 
|  #ifndef MEDIA_BASE_BIT_READER_H_
 | 
|  #define MEDIA_BASE_BIT_READER_H_
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
|  #include "base/compiler_specific.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "media/base/bit_reader_core.h"
 | 
| @@ -18,7 +17,7 @@ class MEDIA_EXPORT BitReader
 | 
|   public:
 | 
|    // Initialize the reader to start reading at |data|, |size| being size
 | 
|    // of |data| in bytes.
 | 
| -  BitReader(const uint8* data, int size);
 | 
| +  BitReader(const uint8_t* data, int size);
 | 
|    ~BitReader() override;
 | 
|  
 | 
|    template<typename T> bool ReadBits(int num_bits, T* out) {
 | 
| @@ -43,13 +42,13 @@ class MEDIA_EXPORT BitReader
 | 
|  
 | 
|   private:
 | 
|    // BitReaderCore::ByteStreamProvider implementation.
 | 
| -  int GetBytes(int max_n, const uint8** out) override;
 | 
| +  int GetBytes(int max_n, const uint8_t** out) override;
 | 
|  
 | 
|    // Total number of bytes that was initially passed to BitReader.
 | 
|    const int initial_size_;
 | 
|  
 | 
|    // Pointer to the next unread byte in the stream.
 | 
| -  const uint8* data_;
 | 
| +  const uint8_t* data_;
 | 
|  
 | 
|    // Bytes left in the stream.
 | 
|    int bytes_left_;
 | 
| 
 |