Cast: Deduplicate event types in cast library.

media/cast/rtcp/sender_rtcp_event_subscriber_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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/logging_defines.h"
@@ skipping 29 matching lines @@
   }
 
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   SenderRtcpEventSubscriber event_subscriber_;
 };
 
 TEST_F(SenderRtcpEventSubscriberTest, InsertEntry) {
   cast_environment_->Logging()->InsertFrameEvent(
-      testing_clock_->NowTicks(), kVideoFrameCaptureBegin, 100u, 1u);
+      testing_clock_->NowTicks(), FRAME_CAPTURE_BEGIN, VIDEO_EVENT, 100u, 1u);
   cast_environment_->Logging()->InsertFrameEvent(
-      testing_clock_->NowTicks(), kVideoFrameCaptureBegin, 200u, 2u);
-  cast_environment_->Logging()->InsertFrameEvent(
-      testing_clock_->NowTicks(), kVideoFrameSentToEncoder, 100u, 1u);
+      testing_clock_->NowTicks(), FRAME_CAPTURE_BEGIN, VIDEO_EVENT, 200u, 2u);
   cast_environment_->Logging()->InsertFrameEvent(testing_clock_->NowTicks(),
-                                                 kVideoFrameEncoded, 100u, 1u);
+                                                 FRAME_ENCODED, VIDEO_EVENT,
+                                                 100u, 1u);
   cast_environment_->Logging()->InsertFrameEvent(testing_clock_->NowTicks(),
-                                                 kVideoFrameEncoded, 300u, 3u);
-  cast_environment_->Logging()->InsertFrameEvent(
-      testing_clock_->NowTicks(), kVideoFrameSentToEncoder, 300u, 3u);
+                                                 FRAME_ENCODED, VIDEO_EVENT,
+                                                 300u, 3u);
 
   RtcpEventMap events;
   event_subscriber_.GetRtcpEventsAndReset(&events);
 
   ASSERT_EQ(3u, events.size());
 
   RtcpEventMap::iterator it = events.begin();
   EXPECT_EQ(100u, it->first);
-  EXPECT_EQ(kVideoFrameEncoded, it->second.type);
+  EXPECT_EQ(FRAME_ENCODED, it->second.type);
 
   ++it;
   EXPECT_EQ(200u, it->first);
-  EXPECT_EQ(kVideoFrameCaptureBegin, it->second.type);
+  EXPECT_EQ(FRAME_CAPTURE_BEGIN, it->second.type);
 
   ++it;
   EXPECT_EQ(300u, it->first);
-  EXPECT_EQ(kVideoFrameEncoded, it->second.type);
+  EXPECT_EQ(FRAME_ENCODED, it->second.type);
 }
 
 TEST_F(SenderRtcpEventSubscriberTest, MapReset) {
   cast_environment_->Logging()->InsertFrameEvent(
-      testing_clock_->NowTicks(), kVideoFrameCaptureBegin, 100u, 1u);
+      testing_clock_->NowTicks(), FRAME_CAPTURE_BEGIN, VIDEO_EVENT, 100u, 1u);
 
   RtcpEventMap events;
   event_subscriber_.GetRtcpEventsAndReset(&events);
   EXPECT_EQ(1u, events.size());
 
   // Call again without any logging in between, should return empty map.
   event_subscriber_.GetRtcpEventsAndReset(&events);
   EXPECT_TRUE(events.empty());
 }
 
 TEST_F(SenderRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) {
   for (uint32 i = 1u; i <= 10u; ++i) {
     cast_environment_->Logging()->InsertFrameEvent(
-        testing_clock_->NowTicks(), kVideoFrameCaptureBegin, i * 10, i);
+        testing_clock_->NowTicks(), FRAME_CAPTURE_BEGIN, VIDEO_EVENT,
+        i * 10, i);
   }
 
   RtcpEventMap events;
   event_subscriber_.GetRtcpEventsAndReset(&events);
 
   ASSERT_EQ(10u, events.size());
   EXPECT_EQ(10u, events.begin()->first);
   EXPECT_EQ(100u, events.rbegin()->first);
 
   for (uint32 i = 1u; i <= 11u; ++i) {
     cast_environment_->Logging()->InsertFrameEvent(
-        testing_clock_->NowTicks(), kVideoFrameCaptureBegin, i * 10, i);
+        testing_clock_->NowTicks(), FRAME_CAPTURE_BEGIN, VIDEO_EVENT,
+        i * 10, i);
   }
 
   event_subscriber_.GetRtcpEventsAndReset(&events);
 
   // Event with RTP timestamp 10 should have been dropped when 110 is inserted.
   ASSERT_EQ(10u, events.size());
   EXPECT_EQ(20u, events.begin()->first);
   EXPECT_EQ(110u, events.rbegin()->first);
 }
 
 }  // namespace cast
 }  // namespace media