Simplify VideoReader and VideoWriter

remoting/protocol/connection_to_host.cc

 // Copyright (c) 2012 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 "remoting/protocol/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
@@ skipping 179 matching lines @@
                      base::Unretained(this)));
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
       event_dispatcher_.reset(new ClientEventDispatcher());
       event_dispatcher_->Init(
           session_.get(), session_->config().event_config(),
           base::Bind(&ConnectionToHost::OnChannelInitialized,
                      base::Unretained(this)));
 
-      video_reader_ = VideoReader::Create(session_->config());
-      video_reader_->Init(session_.get(), monitored_video_stub_.get(),
+      video_reader_.reset(new VideoReader());
+      video_reader_->Init(session_.get(), session_->config().video_config(),
                           base::Bind(&ConnectionToHost::OnChannelInitialized,
                                      base::Unretained(this)));
+      video_reader_->set_video_stub(monitored_video_stub_.get());
 
       audio_reader_ = AudioReader::Create(session_->config());
       if (audio_reader_.get()) {
         audio_reader_->Init(session_.get(), session_->config().audio_config(),
                             base::Bind(&ConnectionToHost::OnChannelInitialized,
                                        base::Unretained(this)));
         audio_reader_->set_audio_stub(audio_stub_);
       }
       break;
 
@@ skipping 85 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting