Cast: Deduplicate event types in cast library.

media/cast/logging/serialize_deserialize_test.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.
 
 // Joint LogSerializer and LogDeserializer testing to make sure they stay in
 // sync.
 
 #include "base/memory/scoped_ptr.h"
 #include "media/cast/logging/log_deserializer.h"
 #include "media/cast/logging/log_serializer.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/proto/proto_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using media::cast::proto::AggregatedFrameEvent;
 using media::cast::proto::AggregatedPacketEvent;
 using media::cast::proto::BasePacketEvent;
 using media::cast::proto::LogMetadata;
 
 namespace {
 
 const media::cast::CastLoggingEvent kVideoFrameEvents[] = {
-    media::cast::kVideoFrameCaptureBegin,  media::cast::kVideoFrameCaptureEnd,
-    media::cast::kVideoFrameSentToEncoder, media::cast::kVideoFrameEncoded,
-    media::cast::kVideoFrameDecoded,       media::cast::kVideoRenderDelay};
+    media::cast::FRAME_CAPTURE_BEGIN,  media::cast::FRAME_CAPTURE_END,
+    media::cast::FRAME_ENCODED, media::cast::FRAME_DECODED,
+    media::cast::FRAME_PLAYOUT };
 
 const media::cast::CastLoggingEvent kVideoPacketEvents[] = {
-    media::cast::kVideoPacketSentToNetwork, media::cast::kVideoPacketReceived};
+    media::cast::PACKET_SENT_TO_NETWORK, media::cast::PACKET_RECEIVED};
 
 // The frame event fields cycle through these numbers.
 const int kEncodedFrameSize[] = {512, 425, 399, 400, 237};
 const int kDelayMillis[] = {15, 4, 8, 42, 23, 16};
 
 const int kMaxSerializedBytes = 10000;
+
 }
 
 namespace media {
 namespace cast {
 
 class SerializeDeserializeTest : public ::testing::Test {
  protected:
   SerializeDeserializeTest()
       : serialized_(new char[kMaxSerializedBytes]), output_bytes_(0) {}
 
@@ skipping 159 matching lines @@
                                  compressed,
                                  100,
                                  serialized_.get(),
                                  &output_bytes_);
   EXPECT_FALSE(success);
   EXPECT_EQ(0, output_bytes_);
 }
 
 }  // namespace cast
 }  // namespace media