Revert 226264 "Be able to build cast_unittest and related target..."

trunk/src/media/cast/rtcp/rtcp_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
 #include "media/cast/rtcp/rtcp.h"
@@ skipping 78 matching lines @@
 };
 
 class RtcpTest : public ::testing::Test {
  protected:
   RtcpTest()
       : transport_(&testing_clock_) {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
 
-  virtual ~RtcpTest() {}
+  ~RtcpTest() {}
 
-  virtual void SetUp() {
+  void SetUp() {
     EXPECT_CALL(mock_sender_feedback_, OnReceivedReportBlock(_)).Times(0);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedIntraFrameRequest()).Times(0);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedRpsi(_, _)).Times(0);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedRemb(_)).Times(0);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedNackRequest(_)).Times(0);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0);
   }
 
   base::SimpleTestTickClock testing_clock_;
   LocalRtcpTransport transport_;
@@ skipping 84 matching lines @@
             kRtcpReducedSize,
             base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
             false,
             kSenderSsrc,
             kCName);
   rtcp.set_clock(&testing_clock_);
   transport_.SetRtcpReceiver(&rtcp);
   rtcp.SetRemoteSSRC(kSenderSsrc);
   RtcpCastMessage cast_message(kSenderSsrc);
   cast_message.ack_frame_id_ = kAckFrameId;
-  std::set<uint16> missing_packets;
+  std::set<uint16_t> missing_packets;
   cast_message.missing_frames_and_packets_[
       kLostFrameId] = missing_packets;
 
   missing_packets.insert(kLostPacketId1);
   missing_packets.insert(kLostPacketId2);
   missing_packets.insert(kLostPacketId3);
   cast_message.missing_frames_and_packets_[
       kFrameIdWithLostPackets] = missing_packets;
   rtcp.SendRtcpCast(cast_message);
 }
@@ skipping 184 matching lines @@
   rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
   rtp_timestamp = 64000;
   EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(frequency, rtp_timestamp,
                                                   &rtp_timestamp_in_ticks));
   EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000),
             rtp_timestamp_in_ticks);
 }
 
 }  // namespace cast
 }  // namespace media