Use scoped_ptr<>.Pass() to pass ownership in the remoting protocol code.

remoting/protocol/pepper_stream_channel.cc

 // Copyright (c) 2011 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/pepper_stream_channel.h"
 
 #include "base/bind.h"
 #include "crypto/hmac.h"
 #include "jingle/glue/utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 36 matching lines @@
       channel_(NULL),
       connected_(false) {
 }
 
 PepperStreamChannel::~PepperStreamChannel() {
   session_->OnDeleteChannel(this);
   // Channel should be already destroyed if we were connected.
   DCHECK(!connected_ || channel_ == NULL);
 }
 
-void PepperStreamChannel::Connect(pp::Instance* pp_instance,
-                                  const TransportConfig& transport_config,
-                                  ChannelAuthenticator* authenticator) {
+void PepperStreamChannel::Connect(
+    pp::Instance* pp_instance,
+    const TransportConfig& transport_config,
+    scoped_ptr<ChannelAuthenticator> authenticator) {
   DCHECK(CalledOnValidThread());
 
-  authenticator_.reset(authenticator);
+  authenticator_ = authenticator.Pass();
 
   pp::Transport_Dev* transport =
       new pp::Transport_Dev(pp_instance, name_.c_str(),
                             PP_TRANSPORTTYPE_STREAM);
 
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_TCP_RECEIVE_WINDOW,
                              pp::Var(kTcpReceiveBufferSize)) != PP_OK) {
     LOG(ERROR) << "Failed to set TCP receive window";
   }
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_TCP_SEND_WINDOW,
@@ skipping 119 matching lines @@
 void PepperStreamChannel::NotifyConnectFailed() {
   channel_ = NULL;
   owned_channel_.reset();
   authenticator_.reset();
 
   NotifyConnected(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting