Index: webrtc/p2p/base/fakesession.h |
diff --git a/webrtc/p2p/base/fakesession.h b/webrtc/p2p/base/fakesession.h |
index bd3c08902508fafc1cf414db3fecbb2d141e48bf..7f096d785e418cf42a9f86ce4f3477e6cf3aa4ec 100644 |
--- a/webrtc/p2p/base/fakesession.h |
+++ b/webrtc/p2p/base/fakesession.h |
@@ -62,7 +62,7 @@ class FakeTransportChannel : public TransportChannelImpl, |
Reset(); |
} |
- uint64 IceTiebreaker() const { return tiebreaker_; } |
+ uint64_t IceTiebreaker() const { return tiebreaker_; } |
IceMode remote_ice_mode() const { return remote_ice_mode_; } |
const std::string& ice_ufrag() const { return ice_ufrag_; } |
const std::string& ice_pwd() const { return ice_pwd_; } |
@@ -94,7 +94,7 @@ class FakeTransportChannel : public TransportChannelImpl, |
void SetIceRole(IceRole role) override { role_ = role; } |
IceRole GetIceRole() const override { return role_; } |
- void SetIceTiebreaker(uint64 tiebreaker) override { |
+ void SetIceTiebreaker(uint64_t tiebreaker) override { |
tiebreaker_ = tiebreaker; |
} |
void SetIceCredentials(const std::string& ice_ufrag, |
@@ -109,7 +109,8 @@ class FakeTransportChannel : public TransportChannelImpl, |
} |
void SetRemoteIceMode(IceMode mode) override { remote_ice_mode_ = mode; } |
- bool SetRemoteFingerprint(const std::string& alg, const uint8* digest, |
+ bool SetRemoteFingerprint(const std::string& alg, |
+ const uint8_t* digest, |
size_t digest_len) override { |
dtls_fingerprint_ = rtc::SSLFingerprint(alg, digest, digest_len); |
return true; |
@@ -264,10 +265,10 @@ class FakeTransportChannel : public TransportChannelImpl, |
} |
bool ExportKeyingMaterial(const std::string& label, |
- const uint8* context, |
+ const uint8_t* context, |
size_t context_len, |
bool use_context, |
- uint8* result, |
+ uint8_t* result, |
size_t result_len) override { |
if (!chosen_srtp_cipher_.empty()) { |
memset(result, 0xff, result_len); |
@@ -311,7 +312,7 @@ class FakeTransportChannel : public TransportChannelImpl, |
std::vector<std::string> srtp_ciphers_; |
std::string chosen_srtp_cipher_; |
IceRole role_; |
- uint64 tiebreaker_; |
+ uint64_t tiebreaker_; |
std::string ice_ufrag_; |
std::string ice_pwd_; |
std::string remote_ice_ufrag_; |