Cast: Deduplicate event types in cast library.

media/cast/transport/pacing/paced_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 <stdint.h>
 
 #include "base/big_endian.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/logging/simple_event_subscriber.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
@@ skipping 156 matching lines @@
   // Check that we don't get any more packets.
   EXPECT_TRUE(RunUntilEmpty(3));
 
   std::vector<PacketEvent> packet_events;
   subscriber_.GetPacketEventsAndReset(&packet_events);
   EXPECT_EQ(num_of_packets, static_cast<int>(packet_events.size()));
   int sent_to_network_event_count = 0;
   for (std::vector<PacketEvent>::iterator it = packet_events.begin();
        it != packet_events.end();
        ++it) {
-    if (it->type == kVideoPacketSentToNetwork)
+    if (it->type == PACKET_SENT_TO_NETWORK)
       sent_to_network_event_count++;
     else
       FAIL() << "Got unexpected event type " << CastLoggingToString(it->type);
   }
   EXPECT_EQ(num_of_packets, sent_to_network_event_count);
 }
 
 TEST_F(PacedSenderTest, PaceWithNack) {
   // Testing what happen when we get multiple NACK requests for a fully lost
   // frames just as we sent the first packets in a frame.
@@ skipping 59 matching lines @@
   EXPECT_EQ(expected_video_network_event_count +
             expected_video_retransmitted_event_count +
             expected_audio_network_event_count,
             static_cast<int>(packet_events.size()));
   int audio_network_event_count = 0;
   int video_network_event_count = 0;
   int video_retransmitted_event_count = 0;
   for (std::vector<PacketEvent>::iterator it = packet_events.begin();
        it != packet_events.end();
        ++it) {
-    if (it->type == kVideoPacketSentToNetwork)
-      video_network_event_count++;
-    else if (it->type == kVideoPacketRetransmitted)
-      video_retransmitted_event_count++;
-    else if (it->type == kAudioPacketSentToNetwork)
-      audio_network_event_count++;
-    else
+    if (it->type == PACKET_SENT_TO_NETWORK) {
+      if (it->media_type == VIDEO_EVENT)
+        video_network_event_count++;
+      else
+        audio_network_event_count++;
+    } else if (it->type == PACKET_RETRANSMITTED) {
+      if (it->media_type == VIDEO_EVENT)
+        video_retransmitted_event_count++;
+    } else {
       FAIL() << "Got unexpected event type " << CastLoggingToString(it->type);
+    }
   }
   EXPECT_EQ(expected_audio_network_event_count, audio_network_event_count);
   EXPECT_EQ(expected_video_network_event_count, video_network_event_count);
   EXPECT_EQ(expected_video_retransmitted_event_count,
             video_retransmitted_event_count);
 }
 
 TEST_F(PacedSenderTest, PaceWith60fps) {
   // Testing what happen when we get multiple NACK requests for a fully lost
   // frames just as we sent the first packets in a frame.
@@ skipping 64 matching lines @@
   testing_clock_.Advance(timeout_10ms);
   task_runner_->RunTasks();
 
   // No more packets.
   EXPECT_TRUE(RunUntilEmpty(5));
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media