[Cast] Cleanup: Remove TransportXXXXXSender, an unnecessary layer of indirection.

media/cast/cast_sender_impl.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/cast_sender_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/video_frame.h"
@@ skipping 82 matching lines @@
 void CastSenderImpl::InitializeAudio(
     const AudioSenderConfig& audio_config,
     const CastInitializationCallback& cast_initialization_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   CHECK(audio_config.use_external_encoder ||
         cast_environment_->HasAudioThread());
 
   audio_sender_.reset(
       new AudioSender(cast_environment_, audio_config, transport_sender_));
 
-  CastInitializationStatus status = audio_sender_->InitializationResult();
-
+  const CastInitializationStatus status = audio_sender_->InitializationResult();
   if (status == STATUS_AUDIO_INITIALIZED) {
     ssrc_of_audio_sender_ = audio_config.incoming_feedback_ssrc;
     audio_frame_input_ =
         new LocalAudioFrameInput(cast_environment_, audio_sender_->AsWeakPtr());
   }
   cast_initialization_cb.Run(status);
 }
 
 void CastSenderImpl::InitializeVideo(
     const VideoSenderConfig& video_config,
     const CastInitializationCallback& cast_initialization_cb,
     const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
     const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   CHECK(video_config.use_external_encoder ||
         cast_environment_->HasVideoThread());
-  VLOG(1) << "CastSender::ctor";

[Alpha Left Google, 2014/06/03 18:48:35]

Hey please don't remove this. It's useful for debugging. Or removing the logging
for dtor as well.

[miu, 2014/06/03 19:57:50]

Done.  I also "improved" all the VLOGs so that one can differentiate logging
from the audio sender vs video sender.

 
   video_sender_.reset(new VideoSender(cast_environment_,
                                       video_config,
                                       create_vea_cb,
                                       create_video_encode_mem_cb,
-                                      cast_initialization_cb,
                                       transport_sender_));
 
-  ssrc_of_video_sender_ = video_config.incoming_feedback_ssrc;
-  video_frame_input_ =
-      new LocalVideoFrameInput(cast_environment_, video_sender_->AsWeakPtr());
+  const CastInitializationStatus status = video_sender_->InitializationResult();
+  if (status == STATUS_VIDEO_INITIALIZED) {
+    ssrc_of_video_sender_ = video_config.incoming_feedback_ssrc;
+    video_frame_input_ =
+        new LocalVideoFrameInput(cast_environment_, video_sender_->AsWeakPtr());
+  }
+  cast_initialization_cb.Run(status);
 }
 
 CastSenderImpl::~CastSenderImpl() {
   VLOG(1) << "CastSender::dtor";
 }
 
 // ReceivedPacket handle the incoming packets to the cast sender
 // it's only expected to receive RTCP feedback packets from the remote cast
 // receiver. The class verifies that that it is a RTCP packet and based on the
 // SSRC of the incoming packet route the packet to the correct sender; audio or
@@ skipping 62 matching lines @@
   return video_frame_input_;
 }
 
 transport::PacketReceiverCallback CastSenderImpl::packet_receiver() {
   return base::Bind(&CastSenderImpl::ReceivedPacket,
                     weak_factory_.GetWeakPtr());
 }
 
 }  // namespace cast
 }  // namespace media