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

remoting/protocol/connection_to_client.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_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "google/protobuf/message.h"
@@ skipping 98 matching lines @@
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
       control_dispatcher_->set_host_stub(host_stub_);
 
       event_dispatcher_.reset(new HostEventDispatcher());
       event_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
       event_dispatcher_->set_input_stub(input_stub_);
       event_dispatcher_->set_sequence_number_callback(base::Bind(
           &ConnectionToClient::UpdateSequenceNumber, base::Unretained(this)));
 
-      video_writer_.reset(VideoWriter::Create(session_->config()));
+      video_writer_.reset();

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

You don't need to reset it here. The assignment should do the right thing.

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

Done.

+      video_writer_ = VideoWriter::Create(session_->config());
       video_writer_->Init(session_.get(), base::Bind(
           &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
 
       // Notify the handler after initializing the channels, so that
       // ClientSession can get a client clipboard stub.
       handler_->OnConnectionAuthenticated(this);
       break;
 
     case Session::CLOSED:
       Close(OK);
@@ skipping 39 matching lines @@
 }
 
 void ConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting