rtcp::VoipMetric block moved into own file and got Parse function

webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc

 /*
  *  Copyright (c) 2014 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.
  *
  * This file includes unit tests for the RtcpPacket.
@@ skipping 777 matching lines @@
   EXPECT_EQ(2, parser.dlrr_items()->num_packets());
   EXPECT_EQ(0x11111111U, parser.dlrr_items()->Ssrc(0));
   EXPECT_EQ(0x22222222U, parser.dlrr_items()->LastRr(0));
   EXPECT_EQ(0x33333333U, parser.dlrr_items()->DelayLastRr(0));
   EXPECT_EQ(0x44444444U, parser.dlrr_items()->Ssrc(1));
   EXPECT_EQ(0x55555555U, parser.dlrr_items()->LastRr(1));
   EXPECT_EQ(0x66666666U, parser.dlrr_items()->DelayLastRr(1));
 }
 
 TEST(RtcpPacketTest, XrWithVoipMetric) {
-  VoipMetric metric;
-  metric.To(kRemoteSsrc);
-  metric.LossRate(1);
-  metric.DiscardRate(2);
-  metric.BurstDensity(3);
-  metric.GapDensity(4);
-  metric.BurstDuration(0x1111);
-  metric.GapDuration(0x2222);
-  metric.RoundTripDelay(0x3333);
-  metric.EndSystemDelay(0x4444);
-  metric.SignalLevel(5);
-  metric.NoiseLevel(6);
-  metric.Rerl(7);
-  metric.Gmin(8);
-  metric.Rfactor(9);
-  metric.ExtRfactor(10);
-  metric.MosLq(11);
-  metric.MosCq(12);
-  metric.RxConfig(13);
-  metric.JbNominal(0x5555);
-  metric.JbMax(0x6666);
-  metric.JbAbsMax(0x7777);
-
+  RTCPVoIPMetric metric;
+  metric.lossRate = 1;
+  metric.discardRate = 2;
+  metric.burstDensity = 3;
+  metric.gapDensity = 4;
+  metric.burstDuration = 0x1111;
+  metric.gapDuration = 0x2222;
+  metric.roundTripDelay = 0x3333;
+  metric.endSystemDelay = 0x4444;
+  metric.signalLevel = 5;
+  metric.noiseLevel = 6;
+  metric.RERL = 7;
+  metric.Gmin = 8;
+  metric.Rfactor = 9;
+  metric.extRfactor = 10;
+  metric.MOSLQ = 11;
+  metric.MOSCQ = 12;
+  metric.RXconfig = 13;
+  metric.JBnominal = 0x5555;
+  metric.JBmax = 0x6666;
+  metric.JBabsMax = 0x7777;
+  VoipMetric metric_block;
+  metric_block.To(kRemoteSsrc);
+  metric_block.WithVoipMetric(metric);
   Xr xr;
   xr.From(kSenderSsrc);
-  EXPECT_TRUE(xr.WithVoipMetric(&metric));
+  EXPECT_TRUE(xr.WithVoipMetric(&metric_block));
 
   rtc::scoped_ptr<RawPacket> packet(xr.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.xr_header()->num_packets());
   EXPECT_EQ(kSenderSsrc, parser.xr_header()->Ssrc());
   EXPECT_EQ(1, parser.voip_metric()->num_packets());
   EXPECT_EQ(kRemoteSsrc, parser.voip_metric()->Ssrc());
   EXPECT_EQ(1, parser.voip_metric()->LossRate());
   EXPECT_EQ(2, parser.voip_metric()->DiscardRate());
@@ skipping 73 matching lines @@
     EXPECT_TRUE(xr.WithDlrr(&dlrr));
   EXPECT_FALSE(xr.WithDlrr(&dlrr));
 
   VoipMetric voip_metric;
   for (int i = 0; i < kMaxBlocks; ++i)
     EXPECT_TRUE(xr.WithVoipMetric(&voip_metric));
   EXPECT_FALSE(xr.WithVoipMetric(&voip_metric));
 }
 
 }  // namespace webrtc