| Index: webrtc/base/macsocketserver_unittest.cc
|
| diff --git a/webrtc/base/macsocketserver_unittest.cc b/webrtc/base/macsocketserver_unittest.cc
|
| index 97732d705d25f3f2d255f8874b51269f231a9745..ecb9a706b71ec60935ae0739b5db0479b0f63abf 100644
|
| --- a/webrtc/base/macsocketserver_unittest.cc
|
| +++ b/webrtc/base/macsocketserver_unittest.cc
|
| @@ -35,7 +35,7 @@ class WakeThread : public Thread {
|
| // Test that MacCFSocketServer::Wait works as expected.
|
| TEST(MacCFSocketServerTest, TestWait) {
|
| MacCFSocketServer server;
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| server.Wait(1000, true);
|
| EXPECT_GE(TimeSince(start), 1000);
|
| }
|
| @@ -44,7 +44,7 @@ TEST(MacCFSocketServerTest, TestWait) {
|
| TEST(MacCFSocketServerTest, TestWakeup) {
|
| MacCFSocketServer server;
|
| WakeThread thread(&server);
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| thread.Start();
|
| server.Wait(10000, true);
|
| EXPECT_LT(TimeSince(start), 10000);
|
| @@ -53,7 +53,7 @@ TEST(MacCFSocketServerTest, TestWakeup) {
|
| // Test that MacCarbonSocketServer::Wait works as expected.
|
| TEST(MacCarbonSocketServerTest, TestWait) {
|
| MacCarbonSocketServer server;
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| server.Wait(1000, true);
|
| EXPECT_GE(TimeSince(start), 1000);
|
| }
|
| @@ -62,7 +62,7 @@ TEST(MacCarbonSocketServerTest, TestWait) {
|
| TEST(MacCarbonSocketServerTest, TestWakeup) {
|
| MacCarbonSocketServer server;
|
| WakeThread thread(&server);
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| thread.Start();
|
| server.Wait(10000, true);
|
| EXPECT_LT(TimeSince(start), 10000);
|
| @@ -71,7 +71,7 @@ TEST(MacCarbonSocketServerTest, TestWakeup) {
|
| // Test that MacCarbonAppSocketServer::Wait works as expected.
|
| TEST(MacCarbonAppSocketServerTest, TestWait) {
|
| MacCarbonAppSocketServer server;
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| server.Wait(1000, true);
|
| EXPECT_GE(TimeSince(start), 1000);
|
| }
|
| @@ -80,7 +80,7 @@ TEST(MacCarbonAppSocketServerTest, TestWait) {
|
| TEST(MacCarbonAppSocketServerTest, TestWakeup) {
|
| MacCarbonAppSocketServer server;
|
| WakeThread thread(&server);
|
| - uint32 start = Time();
|
| + uint32_t start = Time();
|
| thread.Start();
|
| server.Wait(10000, true);
|
| EXPECT_LT(TimeSince(start), 10000);
|
|
|