Cleaned up the reader and writer create methods to return scoped_ptr.

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 140 matching lines @@
   DCHECK(event_callback_);
 
   switch (state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::CONNECTED:
       // Don't care about these events.
       break;
 
     case Session::AUTHENTICATED:
-      video_reader_.reset(VideoReader::Create(session_->config()));
+      video_reader_.reset();

[Sergey Ulanov, 2012/06/15 20:41:43]

same here.

[kxing, 2012/06/15 20:48:17]

Done.

+      video_reader_ = VideoReader::Create(session_->config());
       video_reader_->Init(session_.get(), video_stub_, base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
 
       control_dispatcher_.reset(new ClientControlDispatcher());
       control_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
       event_dispatcher_.reset(new ClientEventDispatcher());
@@ skipping 67 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting