Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

trunk/src/media/cast/video_receiver/video_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/cast_defines.h"
 #include "media/cast/cast_environment.h"
@@ skipping 17 matching lines @@
  public:
   TestVideoReceiverCallback()
       : num_called_(0) {}
 
   // TODO(mikhal): Set and check expectations.
   void DecodeComplete(const scoped_refptr<media::VideoFrame>& video_frame,
                       const base::TimeTicks& render_time) {
     ++num_called_;
   }
 
-  void FrameToDecode(scoped_ptr<transport::EncodedVideoFrame> video_frame,
+  void FrameToDecode(scoped_ptr<EncodedVideoFrame> video_frame,
       const base::TimeTicks& render_time) {
     EXPECT_TRUE(video_frame->key_frame);
-    EXPECT_EQ(transport::kVp8, video_frame->codec);
+    EXPECT_EQ(kVp8, video_frame->codec);
     ++num_called_;
   }
 
   int number_times_called() const { return num_called_;}
 
  protected:
   virtual ~TestVideoReceiverCallback() {}
 
  private:
   friend class base::RefCountedThreadSafe<TestVideoReceiverCallback>;
@@ skipping 10 matching lines @@
       : VideoReceiver(cast_environment, video_config, packet_sender) {
   }
   using VideoReceiver::IncomingParsedRtpPacket;
 };
 
 
 class VideoReceiverTest : public ::testing::Test {
  protected:
   VideoReceiverTest() {
     // Configure to use vp8 software implementation.
-    config_.codec = transport::kVp8;
+    config_.codec = kVp8;
     config_.use_external_decoder = false;
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
         task_runner_, task_runner_, task_runner_, task_runner_,
-        task_runner_, GetDefaultCastLoggingConfig());
+        GetDefaultCastLoggingConfig());
     receiver_.reset(new
         PeerVideoReceiver(cast_environment_, config_, &mock_transport_));
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     video_receiver_callback_ = new TestVideoReceiverCallback();
   }
 
   virtual ~VideoReceiverTest() {}
 
   virtual void SetUp() {
@@ skipping 72 matching lines @@
   task_runner_->RunTasks();
   EXPECT_EQ(video_receiver_callback_->number_times_called(), 0);
 }
 
 // TODO(pwestin): add encoded frames.
 
 }  // namespace cast
 }  // namespace media