| Index: net/spdy/spdy_alt_svc_wire_format.h
|
| diff --git a/net/spdy/spdy_alt_svc_wire_format.h b/net/spdy/spdy_alt_svc_wire_format.h
|
| index 85dd0d3be29b6bc28062280ebee6647dcbf5793e..28b45723684efc6ac535390fd52f22016ea30ef1 100644
|
| --- a/net/spdy/spdy_alt_svc_wire_format.h
|
| +++ b/net/spdy/spdy_alt_svc_wire_format.h
|
| @@ -10,9 +10,10 @@
|
| #ifndef NET_SPDY_SPDY_ALT_SVC_WIRE_FORMAT_H_
|
| #define NET_SPDY_SPDY_ALT_SVC_WIRE_FORMAT_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/strings/string_piece.h"
|
| #include "net/base/net_export.h"
|
|
|
| @@ -24,16 +25,16 @@ class SpdyAltSvcWireFormatPeer;
|
|
|
| class NET_EXPORT_PRIVATE SpdyAltSvcWireFormat {
|
| public:
|
| - using VersionVector = std::vector<uint16>;
|
| + using VersionVector = std::vector<uint16_t>;
|
|
|
| struct NET_EXPORT_PRIVATE AlternativeService {
|
| std::string protocol_id;
|
| std::string host;
|
|
|
| // Default is 0: invalid port.
|
| - uint16 port = 0;
|
| + uint16_t port = 0;
|
| // Default is one day.
|
| - uint32 max_age = 86400;
|
| + uint32_t max_age = 86400;
|
| // Default is always use.
|
| double probability = 1.0;
|
| // Default is empty: unspecified version.
|
| @@ -42,8 +43,8 @@ class NET_EXPORT_PRIVATE SpdyAltSvcWireFormat {
|
| AlternativeService();
|
| AlternativeService(const std::string& protocol_id,
|
| const std::string& host,
|
| - uint16 port,
|
| - uint32 max_age,
|
| + uint16_t port,
|
| + uint32_t max_age,
|
| double probability,
|
| VersionVector version);
|
| ~AlternativeService();
|
| @@ -74,13 +75,13 @@ class NET_EXPORT_PRIVATE SpdyAltSvcWireFormat {
|
| static bool ParseAltAuthority(base::StringPiece::const_iterator c,
|
| base::StringPiece::const_iterator end,
|
| std::string* host,
|
| - uint16* port);
|
| + uint16_t* port);
|
| static bool ParsePositiveInteger16(base::StringPiece::const_iterator c,
|
| base::StringPiece::const_iterator end,
|
| - uint16* value);
|
| + uint16_t* value);
|
| static bool ParsePositiveInteger32(base::StringPiece::const_iterator c,
|
| base::StringPiece::const_iterator end,
|
| - uint32* value);
|
| + uint32_t* value);
|
| static bool ParseProbability(base::StringPiece::const_iterator c,
|
| base::StringPiece::const_iterator end,
|
| double* probability);
|
|
|