Reland of Delete cricket::VideoFrame::GetTimeStamp.

webrtc/media/engine/webrtcvideoframe_unittest.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 168 matching lines @@
 TEST_F(WebRtcVideoFrameTest, InitRotated90DontApplyRotation) {
   TestInit(640, 360, webrtc::kVideoRotation_90, false);
 }
 
 TEST_F(WebRtcVideoFrameTest, TextureInitialValues) {
   webrtc::test::FakeNativeHandle* dummy_handle =
       new webrtc::test::FakeNativeHandle();
   webrtc::NativeHandleBuffer* buffer =
       new rtc::RefCountedObject<webrtc::test::FakeNativeHandleBuffer>(
           dummy_handle, 640, 480);
-  // Timestamp is converted from ns to us, so last three digits are lost.
-  WebRtcVideoFrame frame(buffer, 20000, webrtc::kVideoRotation_0);
+
+  WebRtcVideoFrame frame(buffer, webrtc::kVideoRotation_0, 20);
   EXPECT_EQ(dummy_handle, frame.video_frame_buffer()->native_handle());
   EXPECT_EQ(640, frame.width());
   EXPECT_EQ(480, frame.height());
-  EXPECT_EQ(20000, frame.GetTimeStamp());
   EXPECT_EQ(20, frame.timestamp_us());
   frame.set_timestamp_us(40);
-  EXPECT_EQ(40000, frame.GetTimeStamp());
   EXPECT_EQ(40, frame.timestamp_us());
 }
 
 TEST_F(WebRtcVideoFrameTest, ApplyRotationToFrame) {
   WebRtcVideoFrame applied0;
   EXPECT_TRUE(IsNull(applied0));
   EXPECT_TRUE(LoadFrame(CreateYuvSample(kWidth, kHeight, 12).get(), FOURCC_I420,
                         kWidth, kHeight, &applied0));
 
   // Claim that this frame needs to be rotated for 90 degree.
@@ skipping 14 matching lines @@
   SetFrameRotation(&applied90, webrtc::kVideoRotation_270);
   WebRtcVideoFrame applied360(
       webrtc::I420Buffer::Rotate(applied90.video_frame_buffer(),
                                  applied90.rotation()),
       webrtc::kVideoRotation_0, applied90.timestamp_us());
   EXPECT_EQ(applied360.rotation(), webrtc::kVideoRotation_0);
   EXPECT_TRUE(IsEqual(applied0, applied360, 0));
 }
 
 }  // namespace cricket