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

trunk/src/media/cast/rtcp/rtcp_sender_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/memory/scoped_ptr.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/rtcp/rtcp_sender.h"
 #include "media/cast/rtcp/test_rtcp_packet_builder.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 14 matching lines @@
   }
 
   virtual bool SendRtcpPacket(const std::vector<uint8>& packet) OVERRIDE {
     EXPECT_EQ(expected_packet_length_, packet.size());
     EXPECT_EQ(0, memcmp(expected_packet_, &(packet[0]), packet.size()));
     packet_count_++;
     return true;
   }
 
   virtual bool SendPacket(const std::vector<uint8>& packet,
-                          int num_of_packets) OVERRIDE {
+                          int num_of_packets) {
     return false;
   }
 
   virtual bool ResendPacket(const std::vector<uint8>& packet,
-                            int num_of_packets) OVERRIDE {
+                            int num_of_packets) {
     return false;
   }
 
   void SetExpectedRtcpPacket(const uint8* rtcp_buffer, int length) {
     expected_packet_length_ = length;
     memcpy(expected_packet_, rtcp_buffer, length);
   }
 
   int packet_count() { return packet_count_; }
 
@@ skipping 170 matching lines @@
   report_block.media_ssrc = kMediaSsrc;  // SSRC of the RTP packet sender.
   report_block.fraction_lost = kLoss >> 24;
   report_block.cumulative_lost = kLoss;  // 24 bits valid.
   report_block.extended_high_sequence_number = kExtendedMax;
   report_block.jitter = kJitter;
   report_block.last_sr = kLastSr;
   report_block.delay_since_last_sr = kDelayLastSr;
 
   RtcpCastMessage cast_message(kMediaSsrc);
   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_sender_->SendRtcp(RtcpSender::kRtcpRr | RtcpSender::kRtcpCast,
@@ skipping 34 matching lines @@
                          kMediaSsrc,
                          NULL,
                          NULL,
                          NULL);
 
   EXPECT_EQ(1, test_transport_.packet_count());
 }
 
 }  // namespace cast
 }  // namespace media