Use suffixed {uint,int}{8,16,32,64}_t types.

webrtc/p2p/base/faketransportcontroller.h

Index: webrtc/p2p/base/faketransportcontroller.h
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h
index 6d337a45a9db8a78bbca8d4a30ff97ccd84cd7b8..13622ac693095daf5f672642492feb655e3cbe5c 100644
--- a/webrtc/p2p/base/faketransportcontroller.h
+++ b/webrtc/p2p/base/faketransportcontroller.h
@@ -51,7 +51,7 @@ class FakeTransportChannel : public TransportChannelImpl,
         dtls_fingerprint_("", nullptr, 0) {}
   ~FakeTransportChannel() { 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_; }
@@ -82,7 +82,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,
@@ -98,7 +98,7 @@ class FakeTransportChannel : public TransportChannelImpl,
 
   void SetRemoteIceMode(IceMode mode) override { remote_ice_mode_ = mode; }
   bool SetRemoteFingerprint(const std::string& alg,
-                            const uint8* digest,
+                            const uint8_t* digest,
                             size_t digest_len) override {
     dtls_fingerprint_ = rtc::SSLFingerprint(alg, digest, digest_len);
     return true;
@@ -266,10 +266,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);
@@ -322,8 +322,8 @@ class FakeTransportChannel : public TransportChannelImpl,
   std::string chosen_srtp_cipher_;
   int receiving_timeout_ = -1;
   bool gather_continually_ = false;
-  IceRole role_ = ICEROLE_UNKNOWN;

[the sun, 2015/10/06 11:23:53]

Why aren't these needed anymore?

[pbos-webrtc, 2015/10/06 11:55:12]

Sorry, bad rebase. Added back, thanks.

-  uint64 tiebreaker_ = 0;
+  IceRole role_;
+  uint64_t tiebreaker_;
   std::string ice_ufrag_;
   std::string ice_pwd_;
   std::string remote_ice_ufrag_;