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

remoting/protocol/connection_to_client.cc

Index: remoting/protocol/connection_to_client.cc
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index ce8cbdba44df3695979ea38a2778a7b7820fbbef..b25b647b73b1bb1e80e1d18aec17787638673aea 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -116,7 +116,8 @@ void ConnectionToClient::OnSessionStateChange(Session::State state) {
       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)));