Cast: Deduplicate event types in cast library.

media/cast/audio_receiver/audio_receiver_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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/audio_receiver/audio_receiver.h"
 #include "media/cast/cast_defines.h"
@@ skipping 123 matching lines @@
   fake_audio_client_.SetNextExpectedResult(kFirstFrameId,
                                            testing_clock_->NowTicks());
   FeedOneFrameIntoReceiver();
   task_runner_->RunTasks();
   EXPECT_EQ(1, fake_audio_client_.number_times_called());
 
   std::vector<FrameEvent> frame_events;
   event_subscriber.GetFrameEventsAndReset(&frame_events);
 
   ASSERT_TRUE(!frame_events.empty());
-  EXPECT_EQ(kAudioAckSent, frame_events.begin()->type);
+  EXPECT_EQ(FRAME_ACK_SENT, frame_events.begin()->type);
+  EXPECT_EQ(AUDIO_EVENT, frame_events.begin()->media_type);
   EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id);
   EXPECT_EQ(rtp_header_.rtp_timestamp, frame_events.begin()->rtp_timestamp);
 
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 TEST_F(AudioReceiverTest, MultiplePendingGetCalls) {
   EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
       .WillRepeatedly(testing::Return(true));
 
@@ skipping 68 matching lines @@
 
   // Move forward another 100 ms and run any pending tasks (there should be
   // none).  Expect no additional frames where emitted.
   testing_clock_->Advance(base::TimeDelta::FromMilliseconds(100));
   task_runner_->RunTasks();
   EXPECT_EQ(3, fake_audio_client_.number_times_called());
 }
 
 }  // namespace cast
 }  // namespace media