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

remoting/protocol/ssl_hmac_channel_authenticator.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/ssl_hmac_channel_authenticator.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "crypto/secure_util.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/x509_certificate.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_server_socket.h"
 #include "remoting/protocol/auth_util.h"
 
 namespace remoting {
 namespace protocol {
 
 // static
-SslHmacChannelAuthenticator* SslHmacChannelAuthenticator::CreateForClient(
+scoped_ptr<SslHmacChannelAuthenticator>
+SslHmacChannelAuthenticator::CreateForClient(
       const std::string& remote_cert,
       const std::string& auth_key) {
-  SslHmacChannelAuthenticator* result =
-      new SslHmacChannelAuthenticator(auth_key);
+  scoped_ptr<SslHmacChannelAuthenticator> result(
+      new SslHmacChannelAuthenticator(auth_key));
   result->remote_cert_ = remote_cert;
-  return result;
+  return result.Pass();
 }
 
-SslHmacChannelAuthenticator* SslHmacChannelAuthenticator::CreateForHost(
+scoped_ptr<SslHmacChannelAuthenticator>
+SslHmacChannelAuthenticator::CreateForHost(
     const std::string& local_cert,
     crypto::RSAPrivateKey* local_private_key,
     const std::string& auth_key) {
-  SslHmacChannelAuthenticator* result =
-      new SslHmacChannelAuthenticator(auth_key);
+  scoped_ptr<SslHmacChannelAuthenticator> result(
+      new SslHmacChannelAuthenticator(auth_key));
   result->local_cert_ = local_cert;
   result->local_private_key_ = local_private_key;
-  return result;
+  return result.Pass();
 }
 
 SslHmacChannelAuthenticator::SslHmacChannelAuthenticator(
     const std::string& auth_key)
     : auth_key_(auth_key),
       local_private_key_(NULL),
       legacy_mode_(NONE) {
 }
 
 SslHmacChannelAuthenticator::~SslHmacChannelAuthenticator() {
@@ skipping 210 matching lines @@
   if (auth_write_buf_ == NULL && auth_read_buf_ == NULL) {
     DCHECK(socket_.get() != NULL);
     if (callback_called)
       *callback_called = true;
     done_callback_.Run(net::OK, socket_.release());
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting