Revert of Cast: Fix threading issues in VideoEncoderImpl

media/cast/video_sender/video_sender_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 <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/base/video_frame.h"
@@ skipping 79 matching lines @@
         task_runner_, task_runner_, GetDefaultCastSenderLoggingConfig());
     transport::CastTransportConfig transport_config;
     transport_sender_.reset(new transport::CastTransportSenderImpl(
         &testing_clock_, transport_config,
         base::Bind(&UpdateCastTransportStatus), task_runner_));
     transport_sender_->InsertFakeTransportForTesting(&transport_);
   }
 
   virtual ~VideoSenderTest() {}
 
-  virtual void TearDown() OVERRIDE {
-    video_sender_.reset();
-    task_runner_->RunTasks();
-  }
-
   static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
   }
 
   void InitEncoder(bool external) {
     VideoSenderConfig video_config;
     video_config.sender_ssrc = 1;
     video_config.incoming_feedback_ssrc = 2;
     video_config.rtcp_c_name = "video_test@10.1.1.1";
     video_config.rtp_payload_type = 127;
     video_config.use_external_encoder = external;
@@ skipping 115 matching lines @@
   RunTasks(max_resend_timeout.InMilliseconds());
   // Should have sent at least 3 packets.
   EXPECT_GE(
       transport_.number_of_rtp_packets() + transport_.number_of_rtcp_packets(),
       3);
 }
 
 }  // namespace cast
 }  // namespace media