Index: net/spdy/spdy_test_util_common.h |
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h |
index dd78283c1a9fad8dfc19bce6d80d2350ebf228b9..474afd758774d440e93af0f91d507ddf5a60f409 100644 |
--- a/net/spdy/spdy_test_util_common.h |
+++ b/net/spdy/spdy_test_util_common.h |
@@ -5,9 +5,13 @@ |
#ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ |
#define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <string> |
#include <vector> |
+#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "crypto/ec_private_key.h" |
@@ -129,7 +133,7 @@ struct SpdyHeaderInfo { |
bool compressed; |
SpdyRstStreamStatus status; |
const char* data; |
- uint32 data_length; |
+ uint32_t data_length; |
SpdyDataFlags data_flags; |
}; |
@@ -139,11 +143,11 @@ class MockECSignatureCreator : public crypto::ECSignatureCreator { |
explicit MockECSignatureCreator(crypto::ECPrivateKey* key); |
// crypto::ECSignatureCreator |
- bool Sign(const uint8* data, |
+ bool Sign(const uint8_t* data, |
int data_len, |
- std::vector<uint8>* signature) override; |
- bool DecodeSignature(const std::vector<uint8>& signature, |
- std::vector<uint8>* out_raw_sig) override; |
+ std::vector<uint8_t>* signature) override; |
+ bool DecodeSignature(const std::vector<uint8_t>& signature, |
+ std::vector<uint8_t>* out_raw_sig) override; |
private: |
crypto::ECPrivateKey* key_; |
@@ -291,13 +295,13 @@ class SpdyTestUtil { |
base::StringPiece url) const; |
scoped_ptr<SpdyHeaderBlock> ConstructHeadHeaderBlock( |
base::StringPiece url, |
- int64 content_length) const; |
+ int64_t content_length) const; |
scoped_ptr<SpdyHeaderBlock> ConstructPostHeaderBlock( |
base::StringPiece url, |
- int64 content_length) const; |
+ int64_t content_length) const; |
scoped_ptr<SpdyHeaderBlock> ConstructPutHeaderBlock( |
base::StringPiece url, |
- int64 content_length) const; |
+ int64_t content_length) const; |
// Construct a SPDY frame. If it is a SYN_STREAM or SYN_REPLY frame (as |
// specified in header_info.kind), the provided headers are included in the |
@@ -358,7 +362,7 @@ class SpdyTestUtil { |
// Construct a SPDY PING frame. |
// Returns the constructed frame. The caller takes ownership of the frame. |
- SpdyFrame* ConstructSpdyPing(uint32 ping_id, bool is_ack) const; |
+ SpdyFrame* ConstructSpdyPing(uint32_t ping_id, bool is_ack) const; |
// Construct a SPDY GOAWAY frame with last_good_stream_id = 0. |
// Returns the constructed frame. The caller takes ownership of the frame. |
@@ -377,9 +381,8 @@ class SpdyTestUtil { |
// Construct a SPDY WINDOW_UPDATE frame. |
// Returns the constructed frame. The caller takes ownership of the frame. |
- SpdyFrame* ConstructSpdyWindowUpdate( |
- SpdyStreamId stream_id, |
- uint32 delta_window_size) const; |
+ SpdyFrame* ConstructSpdyWindowUpdate(SpdyStreamId stream_id, |
+ uint32_t delta_window_size) const; |
// Construct a SPDY RST_STREAM frame. |
// Returns the constructed frame. The caller takes ownership of the frame. |
@@ -490,7 +493,7 @@ class SpdyTestUtil { |
// Returns a SpdyFrame. |
SpdyFrame* ConstructSpdyPost(const char* url, |
SpdyStreamId stream_id, |
- int64 content_length, |
+ int64_t content_length, |
RequestPriority priority, |
const char* const extra_headers[], |
int extra_header_count); |
@@ -514,13 +517,15 @@ class SpdyTestUtil { |
bool fin); |
// Constructs a single SPDY data frame with the given content. |
- SpdyFrame* ConstructSpdyBodyFrame(int stream_id, const char* data, |
- uint32 len, bool fin); |
+ SpdyFrame* ConstructSpdyBodyFrame(int stream_id, |
+ const char* data, |
+ uint32_t len, |
+ bool fin); |
// Constructs a single SPDY data frame with the given content and padding. |
SpdyFrame* ConstructSpdyBodyFrame(int stream_id, |
const char* data, |
- uint32 len, |
+ uint32_t len, |
bool fin, |
int padding_length); |
@@ -561,7 +566,7 @@ class SpdyTestUtil { |
scoped_ptr<SpdyHeaderBlock> ConstructHeaderBlock( |
base::StringPiece method, |
base::StringPiece url, |
- int64* content_length) const; |
+ int64_t* content_length) const; |
const NextProto protocol_; |
const SpdyMajorVersion spdy_version_; |