Cast: Refactor RTCP handling

media/cast/net/rtp/cast_message_builder_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/net/rtcp/rtcp.h"
 #include "media/cast/net/rtp/cast_message_builder.h"
@@ skipping 10 matching lines @@
 static const int64 kStartMillisecond = INT64_C(12345678900000);
 
 typedef std::map<uint32, size_t> MissingPacketsMap;
 
 class NackFeedbackVerification : public RtpPayloadFeedback {
  public:
   NackFeedbackVerification()
       : triggered_(false), missing_packets_(), last_frame_acked_(0) {}
 
   virtual void CastFeedback(const RtcpCastMessage& cast_feedback) OVERRIDE {
-    EXPECT_EQ(kSsrc, cast_feedback.media_ssrc_);
+    EXPECT_EQ(kSsrc, cast_feedback.media_ssrc);
 
-    last_frame_acked_ = cast_feedback.ack_frame_id_;
+    last_frame_acked_ = cast_feedback.ack_frame_id;
 
     MissingFramesAndPacketsMap::const_iterator frame_it =
-        cast_feedback.missing_frames_and_packets_.begin();
+        cast_feedback.missing_frames_and_packets.begin();
 
     // Keep track of the number of missing packets per frame.
     missing_packets_.clear();
-    while (frame_it != cast_feedback.missing_frames_and_packets_.end()) {
+    while (frame_it != cast_feedback.missing_frames_and_packets.end()) {
       // Check for complete frame lost.
       if ((frame_it->second.size() == 1) &&
           (*frame_it->second.begin() == kRtcpCastAllPacketsLost)) {
         missing_packets_.insert(
             std::make_pair(frame_it->first, kRtcpCastAllPacketsLost));
       } else {
         missing_packets_.insert(
             std::make_pair(frame_it->first, frame_it->second.size()));
       }
       ++frame_it;
@@ skipping 369 matching lines @@
   SetFrameIds(frame_id, frame_id - 1);
   InsertPacket();
   testing_clock_.Advance(
       base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
   EXPECT_TRUE(feedback_.triggered());
   EXPECT_EQ(frame_id, feedback_.last_frame_acked());
 }
 
 }  // namespace cast
 }  // namespace media