Cast: Reshuffle files under media/cast

media/cast/receiver/video_decoder_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 <cstdlib>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/receiver/video_decoder.h"
+#include "media/cast/sender/vp8_encoder.h"
 #include "media/cast/test/utility/standalone_cast_environment.h"
 #include "media/cast/test/utility/video_utility.h"
-#include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 
 const int kWidth = 360;
 const int kHeight = 240;
 const int kFrameRate = 10;
 
 VideoSenderConfig GetVideoSenderConfigForTest() {
   VideoSenderConfig config;
   config.width = kWidth;
   config.height = kHeight;
   config.max_frame_rate = kFrameRate;
   return config;
 }
 
 }  // namespace
 
-class VideoDecoderTest : public ::testing::TestWithParam<transport::Codec> {
+class VideoDecoderTest : public ::testing::TestWithParam<Codec> {
  public:
   VideoDecoderTest()
       : cast_environment_(new StandaloneCastEnvironment()),
         vp8_encoder_(GetVideoSenderConfigForTest(), 0),
         cond_(&lock_) {
     vp8_encoder_.Initialize();
   }
 
  protected:
   virtual void SetUp() OVERRIDE {
@@ skipping 17 matching lines @@
     const scoped_refptr<VideoFrame> video_frame =
         VideoFrame::CreateFrame(VideoFrame::YV12,
                                 frame_size,
                                 gfx::Rect(frame_size),
                                 frame_size,
                                 next_frame_timestamp_);
     next_frame_timestamp_ += base::TimeDelta::FromSeconds(1) / kFrameRate;
     PopulateVideoFrame(video_frame, 0);
 
     // Encode |frame| into |encoded_frame->data|.
-    scoped_ptr<transport::EncodedFrame> encoded_frame(
-        new transport::EncodedFrame());
+    scoped_ptr<EncodedFrame> encoded_frame(
+        new EncodedFrame());
     // Test only supports VP8, currently.
-    CHECK_EQ(transport::CODEC_VIDEO_VP8, GetParam());
+    CHECK_EQ(CODEC_VIDEO_VP8, GetParam());
     vp8_encoder_.Encode(video_frame, encoded_frame.get());
     encoded_frame->frame_id = last_frame_id_ + 1 + num_dropped_frames;
     last_frame_id_ = encoded_frame->frame_id;
 
     {
       base::AutoLock auto_lock(lock_);
       ++total_video_frames_feed_in_;
     }
 
     cast_environment_->PostTask(
@@ skipping 80 matching lines @@
       FeedMoreVideo(num_dropped);
     } else {
       FeedMoreVideo(0);
     }
   }
   WaitForAllVideoToBeDecoded();
 }
 
 INSTANTIATE_TEST_CASE_P(VideoDecoderTestScenarios,
                         VideoDecoderTest,
-                        ::testing::Values(transport::CODEC_VIDEO_VP8));
+                        ::testing::Values(CODEC_VIDEO_VP8));
 
 }  // namespace cast
 }  // namespace media