Index: talk/media/sctp/sctpdataengine_unittest.cc |
diff --git a/talk/media/sctp/sctpdataengine_unittest.cc b/talk/media/sctp/sctpdataengine_unittest.cc |
index d406fa18cdcafe60ffbb31db71572c7235e6d72b..0658c0548b2f4737da25281d33a68ff21d7273f5 100644 |
--- a/talk/media/sctp/sctpdataengine_unittest.cc |
+++ b/talk/media/sctp/sctpdataengine_unittest.cc |
@@ -174,21 +174,19 @@ class SignalChannelClosedObserver : public sigslot::has_slots<> { |
channel->SignalStreamClosedRemotely.connect( |
this, &SignalChannelClosedObserver::OnStreamClosed); |
} |
- void OnStreamClosed(uint32 stream) { |
- streams_.push_back(stream); |
- } |
+ void OnStreamClosed(uint32_t stream) { streams_.push_back(stream); } |
- int StreamCloseCount(uint32 stream) { |
+ int StreamCloseCount(uint32_t stream) { |
return std::count(streams_.begin(), streams_.end(), stream); |
} |
- bool WasStreamClosed(uint32 stream) { |
+ bool WasStreamClosed(uint32_t stream) { |
return std::find(streams_.begin(), streams_.end(), stream) |
!= streams_.end(); |
} |
private: |
- std::vector<uint32> streams_; |
+ std::vector<uint32_t> streams_; |
}; |
class SignalChannelClosedReopener : public sigslot::has_slots<> { |
@@ -303,7 +301,8 @@ class SctpDataMediaChannelTest : public testing::Test, |
return channel; |
} |
- bool SendData(cricket::SctpDataMediaChannel* chan, uint32 ssrc, |
+ bool SendData(cricket::SctpDataMediaChannel* chan, |
+ uint32_t ssrc, |
const std::string& msg, |
cricket::SendDataResult* result) { |
cricket::SendDataParams params; |
@@ -313,8 +312,9 @@ class SctpDataMediaChannelTest : public testing::Test, |
&msg[0], msg.length()), result); |
} |
- bool ReceivedData(const SctpFakeDataReceiver* recv, uint32 ssrc, |
- const std::string& msg ) { |
+ bool ReceivedData(const SctpFakeDataReceiver* recv, |
+ uint32_t ssrc, |
+ const std::string& msg) { |
return (recv->received() && |
recv->last_params().ssrc == ssrc && |
recv->last_data() == msg); |