| Index: webrtc/voice_engine/test/auto_test/voe_conference_test.cc
|
| diff --git a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
|
| index d2407f30e4605ed132ea06e1c419e13c0c2acf4e..f9d227188b9f22151cd210d39a23637c8623e7e1 100644
|
| --- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
|
| +++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
|
| @@ -72,7 +72,7 @@ TEST(VoeConferenceTest, RttAndStartNtpTime) {
|
| const int kStatsRequestIntervalMs = 1000;
|
| const int kStatsBufferSize = 3;
|
|
|
| - uint32 deadline = rtc::TimeAfter(kMaxRunTimeMs);
|
| + uint32_t deadline = rtc::TimeAfter(kMaxRunTimeMs);
|
| // Run the following up to |kMaxRunTimeMs| milliseconds.
|
| int successive_pass = 0;
|
| webrtc::CallStatistics stats_1;
|
|
|