Cast: Reshuffle files under media/cast

media/cast/net/rtp/frame_buffer_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 "media/cast/framer/frame_buffer.h"
+#include "media/cast/net/rtp/frame_buffer.h"
+#include "media/cast/net/cast_transport_defines.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 class FrameBufferTest : public ::testing::Test {
  protected:
   FrameBufferTest() {
     payload_.assign(kMaxIpPacketSize, 0);
   }
 
   virtual ~FrameBufferTest() {}
 
   FrameBuffer buffer_;
   std::vector<uint8> payload_;
   RtpCastHeader rtp_header_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameBufferTest);
 };
 
 TEST_F(FrameBufferTest, OnePacketInsertSanity) {
   rtp_header_.rtp_timestamp = 3000;
   rtp_header_.is_key_frame = true;
   rtp_header_.frame_id = 5;
   rtp_header_.reference_frame_id = 5;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
-  transport::EncodedFrame frame;
+  EncodedFrame frame;
   EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
-  EXPECT_EQ(transport::EncodedFrame::KEY, frame.dependency);
+  EXPECT_EQ(EncodedFrame::KEY, frame.dependency);
   EXPECT_EQ(5u, frame.frame_id);
   EXPECT_EQ(5u, frame.referenced_frame_id);
   EXPECT_EQ(3000u, frame.rtp_timestamp);
 }
 
 TEST_F(FrameBufferTest, EmptyBuffer) {
   EXPECT_FALSE(buffer_.Complete());
-  transport::EncodedFrame frame;
+  EncodedFrame frame;
   EXPECT_FALSE(buffer_.AssembleEncodedFrame(&frame));
 }
 
 TEST_F(FrameBufferTest, DefaultOnePacketFrame) {
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   EXPECT_TRUE(buffer_.Complete());
   EXPECT_FALSE(buffer_.is_key_frame());
-  transport::EncodedFrame frame;
+  EncodedFrame frame;
   EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
   EXPECT_EQ(payload_.size(), frame.data.size());
 }
 
 TEST_F(FrameBufferTest, MultiplePacketFrame) {
   rtp_header_.is_key_frame = true;
   rtp_header_.max_packet_id = 2;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   EXPECT_TRUE(buffer_.Complete());
   EXPECT_TRUE(buffer_.is_key_frame());
-  transport::EncodedFrame frame;
+  EncodedFrame frame;
   EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
   EXPECT_EQ(3 * payload_.size(), frame.data.size());
 }
 
 TEST_F(FrameBufferTest, IncompleteFrame) {
   rtp_header_.max_packet_id = 4;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   // Increment again - skip packet #2.
   ++rtp_header_.packet_id;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   ++rtp_header_.packet_id;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   EXPECT_FALSE(buffer_.Complete());
   // Insert missing packet.
   rtp_header_.packet_id = 2;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   EXPECT_TRUE(buffer_.Complete());
 }
 
 }  // namespace media
 }  // namespace cast