Index: talk/app/webrtc/mediastreamsignaling_unittest.cc |
diff --git a/talk/app/webrtc/mediastreamsignaling_unittest.cc b/talk/app/webrtc/mediastreamsignaling_unittest.cc |
index e5f20ec0c10526ea25829a0b9221d9022f3c82e1..b756259ec99934bb7f4f7341cee38e5895968dba 100644 |
--- a/talk/app/webrtc/mediastreamsignaling_unittest.cc |
+++ b/talk/app/webrtc/mediastreamsignaling_unittest.cc |
@@ -312,19 +312,19 @@ class MockSignalingObserver : public webrtc::MediaStreamSignalingObserver { |
virtual void OnAddLocalAudioTrack(MediaStreamInterface* stream, |
AudioTrackInterface* audio_track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
AddTrack(&local_audio_tracks_, stream, audio_track, ssrc); |
} |
virtual void OnAddLocalVideoTrack(MediaStreamInterface* stream, |
VideoTrackInterface* video_track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
AddTrack(&local_video_tracks_, stream, video_track, ssrc); |
} |
virtual void OnRemoveLocalAudioTrack(MediaStreamInterface* stream, |
AudioTrackInterface* audio_track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
RemoveTrack(&local_audio_tracks_, stream, audio_track); |
} |
@@ -335,13 +335,13 @@ class MockSignalingObserver : public webrtc::MediaStreamSignalingObserver { |
virtual void OnAddRemoteAudioTrack(MediaStreamInterface* stream, |
AudioTrackInterface* audio_track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
AddTrack(&remote_audio_tracks_, stream, audio_track, ssrc); |
} |
virtual void OnAddRemoteVideoTrack(MediaStreamInterface* stream, |
VideoTrackInterface* video_track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
AddTrack(&remote_video_tracks_, stream, video_track, ssrc); |
} |
@@ -368,53 +368,52 @@ class MockSignalingObserver : public webrtc::MediaStreamSignalingObserver { |
size_t NumberOfRemoteAudioTracks() { return remote_audio_tracks_.size(); } |
- void VerifyRemoteAudioTrack(const std::string& stream_label, |
- const std::string& track_id, |
- uint32 ssrc) { |
+ void VerifyRemoteAudioTrack(const std::string& stream_label, |
+ const std::string& track_id, |
+ uint32_t ssrc) { |
VerifyTrack(remote_audio_tracks_, stream_label, track_id, ssrc); |
} |
size_t NumberOfRemoteVideoTracks() { return remote_video_tracks_.size(); } |
- void VerifyRemoteVideoTrack(const std::string& stream_label, |
- const std::string& track_id, |
- uint32 ssrc) { |
+ void VerifyRemoteVideoTrack(const std::string& stream_label, |
+ const std::string& track_id, |
+ uint32_t ssrc) { |
VerifyTrack(remote_video_tracks_, stream_label, track_id, ssrc); |
} |
size_t NumberOfLocalAudioTracks() { return local_audio_tracks_.size(); } |
- void VerifyLocalAudioTrack(const std::string& stream_label, |
- const std::string& track_id, |
- uint32 ssrc) { |
+ void VerifyLocalAudioTrack(const std::string& stream_label, |
+ const std::string& track_id, |
+ uint32_t ssrc) { |
VerifyTrack(local_audio_tracks_, stream_label, track_id, ssrc); |
} |
size_t NumberOfLocalVideoTracks() { return local_video_tracks_.size(); } |
- void VerifyLocalVideoTrack(const std::string& stream_label, |
- const std::string& track_id, |
- uint32 ssrc) { |
+ void VerifyLocalVideoTrack(const std::string& stream_label, |
+ const std::string& track_id, |
+ uint32_t ssrc) { |
VerifyTrack(local_video_tracks_, stream_label, track_id, ssrc); |
} |
private: |
struct TrackInfo { |
TrackInfo() {} |
- TrackInfo(const std::string& stream_label, const std::string track_id, |
- uint32 ssrc) |
- : stream_label(stream_label), |
- track_id(track_id), |
- ssrc(ssrc) { |
- } |
+ TrackInfo(const std::string& stream_label, |
+ const std::string track_id, |
+ uint32_t ssrc) |
+ : stream_label(stream_label), track_id(track_id), ssrc(ssrc) {} |
std::string stream_label; |
std::string track_id; |
- uint32 ssrc; |
+ uint32_t ssrc; |
}; |
typedef std::vector<TrackInfo> TrackInfos; |
- void AddTrack(TrackInfos* track_infos, MediaStreamInterface* stream, |
+ void AddTrack(TrackInfos* track_infos, |
+ MediaStreamInterface* stream, |
MediaStreamTrackInterface* track, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
(*track_infos).push_back(TrackInfo(stream->label(), track->id(), |
ssrc)); |
} |
@@ -442,11 +441,10 @@ class MockSignalingObserver : public webrtc::MediaStreamSignalingObserver { |
return NULL; |
} |
- |
void VerifyTrack(const TrackInfos& track_infos, |
const std::string& stream_label, |
const std::string& track_id, |
- uint32 ssrc) { |
+ uint32_t ssrc) { |
const TrackInfo* track_info = FindTrackInfo(track_infos, |
stream_label, |
track_id); |