| Index: components/cronet/android/cronet_upload_data_stream.h
|
| diff --git a/components/cronet/android/cronet_upload_data_stream.h b/components/cronet/android/cronet_upload_data_stream.h
|
| index b2ff6df2c1c79508b2bf6dd98b51b2c9b5e76a76..c8d5f29715282fbba8d0bd4f027483048d611768 100644
|
| --- a/components/cronet/android/cronet_upload_data_stream.h
|
| +++ b/components/cronet/android/cronet_upload_data_stream.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef COMPONENTS_CRONET_ANDROID_CRONET_UPLOAD_DATA_STREAM_H_
|
| #define COMPONENTS_CRONET_ANDROID_CRONET_UPLOAD_DATA_STREAM_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -55,7 +56,7 @@ class CronetUploadDataStream : public net::UploadDataStream {
|
| DISALLOW_COPY_AND_ASSIGN(Delegate);
|
| };
|
|
|
| - CronetUploadDataStream(Delegate* delegate, int64 size);
|
| + CronetUploadDataStream(Delegate* delegate, int64_t size);
|
| ~CronetUploadDataStream() override;
|
|
|
| // Failure is handled at the Java layer. These two success callbacks are
|
| @@ -74,7 +75,7 @@ class CronetUploadDataStream : public net::UploadDataStream {
|
| void StartRewind();
|
|
|
| // Size of the upload. -1 if chunked.
|
| - const int64 size_;
|
| + const int64_t size_;
|
|
|
| // True if ReadInternal has been called, the read hasn't completed, and there
|
| // hasn't been a ResetInternal call yet.
|
|
|