Cast: Reshuffle files under media/cast

media/cast/sender/external_video_encoder_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 <vector>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
+#include "media/cast/sender/external_video_encoder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/fake_video_encode_accelerator.h"
 #include "media/cast/test/utility/video_utility.h"
-#include "media/cast/video_sender/external_video_encoder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 namespace cast {
 
 using testing::_;
 
 namespace {
 
 void CreateVideoEncodeAccelerator(
@@ skipping 20 matching lines @@
 
   void SetExpectedResult(uint32 expected_frame_id,
                          uint32 expected_last_referenced_frame_id,
                          const base::TimeTicks& expected_capture_time) {
     expected_frame_id_ = expected_frame_id;
     expected_last_referenced_frame_id_ = expected_last_referenced_frame_id;
     expected_capture_time_ = expected_capture_time;
   }
 
   void DeliverEncodedVideoFrame(
-      scoped_ptr<transport::EncodedFrame> encoded_frame) {
+      scoped_ptr<EncodedFrame> encoded_frame) {
     if (expected_frame_id_ == expected_last_referenced_frame_id_) {
-      EXPECT_EQ(transport::EncodedFrame::KEY, encoded_frame->dependency);
+      EXPECT_EQ(EncodedFrame::KEY, encoded_frame->dependency);
     } else {
-      EXPECT_EQ(transport::EncodedFrame::DEPENDENT,
+      EXPECT_EQ(EncodedFrame::DEPENDENT,
                 encoded_frame->dependency);
     }
     EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id);
     EXPECT_EQ(expected_last_referenced_frame_id_,
               encoded_frame->referenced_frame_id);
     EXPECT_EQ(expected_capture_time_, encoded_frame->reference_time);
   }
 
  protected:
   virtual ~TestVideoEncoderCallback() {}
@@ skipping 20 matching lines @@
     video_config_.use_external_encoder = true;
     video_config_.width = 320;
     video_config_.height = 240;
     video_config_.max_bitrate = 5000000;
     video_config_.min_bitrate = 1000000;
     video_config_.start_bitrate = 2000000;
     video_config_.max_qp = 56;
     video_config_.min_qp = 0;
     video_config_.max_frame_rate = 30;
     video_config_.max_number_of_video_buffers_used = 3;
-    video_config_.codec = transport::CODEC_VIDEO_VP8;
+    video_config_.codec = CODEC_VIDEO_VP8;
     gfx::Size size(video_config_.width, video_config_.height);
     video_frame_ = media::VideoFrame::CreateFrame(
         VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
     PopulateVideoFrame(video_frame_, 123);
 
     testing_clock_ = new base::SimpleTestTickClock();
     task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
     cast_environment_ =
         new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(),
                             task_runner_,
@@ skipping 69 matching lines @@
       video_frame_, capture_time, frame_encoded_callback));
   task_runner_->RunTasks();
 
   // We need to run the task to cleanup the GPU instance.
   video_encoder_.reset(NULL);
   task_runner_->RunTasks();
 }
 
 }  // namespace cast
 }  // namespace media