Cast: Deduplicate event types in cast library.

media/cast/logging/receiver_time_offset_estimator_impl_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 47 matching lines @@
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   RtpTimestamp rtp_timestamp = 0;
   uint32 frame_id = 0;
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
 
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp,
       frame_id,
       1234,
       true,
       5678);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp, frame_id);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp, frame_id);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   cast_environment_->Logging()->InsertFrameEvent(
-      sender_clock_->NowTicks(), kVideoAckReceived, rtp_timestamp, frame_id);
+      sender_clock_->NowTicks(), FRAME_ACK_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp, frame_id);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   int64 lower_bound_ms = lower_bound.InMilliseconds();
   int64 upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_EQ(70, lower_bound_ms);
   EXPECT_EQ(110, upper_bound_ms);
   EXPECT_GE(true_offset_ms, lower_bound_ms);
   EXPECT_LE(true_offset_ms, upper_bound_ms);
 }
 
 // Same scenario as above, but event C arrives before event B. It doens't mean
 // event C occurred before event B.
 TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   int64 true_offset_ms = 100;
   receiver_clock_.Advance(base::TimeDelta::FromMilliseconds(true_offset_ms));
 
   base::TimeDelta lower_bound;
   base::TimeDelta upper_bound;
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   RtpTimestamp rtp_timestamp = 0;
   uint32 frame_id = 0;
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
 
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp,
       frame_id,
       1234,
       true,
       5678);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
   base::TimeTicks event_b_time = receiver_clock_.NowTicks();
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   base::TimeTicks event_c_time = sender_clock_->NowTicks();
 
   cast_environment_->Logging()->InsertFrameEvent(
-      event_c_time, kVideoAckReceived, rtp_timestamp, frame_id);
+      event_c_time, FRAME_ACK_RECEIVED, VIDEO_EVENT, rtp_timestamp, frame_id);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   cast_environment_->Logging()->InsertFrameEvent(
-      event_b_time, kVideoAckSent, rtp_timestamp, frame_id);
+      event_b_time, FRAME_ACK_SENT, VIDEO_EVENT, rtp_timestamp, frame_id);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   int64 lower_bound_ms = lower_bound.InMilliseconds();
   int64 upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_EQ(70, lower_bound_ms);
   EXPECT_EQ(110, upper_bound_ms);
   EXPECT_GE(true_offset_ms, lower_bound_ms);
   EXPECT_LE(true_offset_ms, upper_bound_ms);
 }
@@ skipping 13 matching lines @@
   int frame_id_c = 2;
 
   // Frame 1 times: [20, 30+100, 60]
   // Frame 2 times: [30, 50+100, 55]
   // Frame 3 times: [77, 80+100, 110]
   // Bound should end up at [95, 103]
   // Events times in chronological order: 20, 30 x2, 50, 55, 60, 77, 80, 110
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_a,
       frame_id_a,
       1234,
       true,
       5678);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_b,
       frame_id_b,
       1234,
       true,
       5678);
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_a, frame_id_a);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_a, frame_id_a);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_b, frame_id_b);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_b, frame_id_b);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_b,
                                                  frame_id_b);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_a,
                                                  frame_id_a);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(17));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_c,
       frame_id_c,
       1234,
       true,
       5678);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(3));
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_c, frame_id_c);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_c, frame_id_c);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_c,
                                                  frame_id_c);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
   int64 lower_bound_ms = lower_bound.InMilliseconds();
   int64 upper_bound_ms = upper_bound.InMilliseconds();
   EXPECT_EQ(95, lower_bound_ms);
   EXPECT_EQ(103, upper_bound_ms);
   EXPECT_GE(true_offset_ms, lower_bound_ms);
   EXPECT_LE(true_offset_ms, upper_bound_ms);
 }
 
 }  // namespace cast
 }  // namespace media