| Index: talk/media/base/videocapturer_unittest.cc
|
| diff --git a/talk/media/base/videocapturer_unittest.cc b/talk/media/base/videocapturer_unittest.cc
|
| index 70902325e9f1d9b26e7edc8adf99055317c07b59..29b95d018080b407782df87456076d9b196d5517 100644
|
| --- a/talk/media/base/videocapturer_unittest.cc
|
| +++ b/talk/media/base/videocapturer_unittest.cc
|
| @@ -44,7 +44,7 @@ namespace {
|
| const int kMsCallbackWait = 500;
|
| // For HD only the height matters.
|
| const int kMinHdHeight = 720;
|
| -const uint32 kTimeout = 5000U;
|
| +const uint32_t kTimeout = 5000U;
|
|
|
| } // namespace
|
|
|
| @@ -88,13 +88,13 @@ class VideoCapturerTest
|
| int video_frames_received() const {
|
| return video_frames_received_;
|
| }
|
| - int64 last_frame_elapsed_time() const { return last_frame_elapsed_time_; }
|
| + int64_t last_frame_elapsed_time() const { return last_frame_elapsed_time_; }
|
|
|
| cricket::FakeVideoCapturer capturer_;
|
| cricket::CaptureState capture_state_;
|
| int num_state_changes_;
|
| int video_frames_received_;
|
| - int64 last_frame_elapsed_time_;
|
| + int64_t last_frame_elapsed_time_;
|
| cricket::FakeVideoRenderer renderer_;
|
| bool expects_rotation_applied_;
|
| };
|
|
|