Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/negotiating_client_authenticator.cc

 // Copyright 2013 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/negotiating_client_authenticator.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
     const std::string& shared_secret,
     const std::string& authentication_tag,
     const FetchSecretCallback& fetch_secret_callback,
     scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher,
     const std::vector<AuthenticationMethod>& methods)
     : NegotiatingAuthenticatorBase(MESSAGE_READY),
       client_pairing_id_(client_pairing_id),
       shared_secret_(shared_secret),
       authentication_tag_(authentication_tag),
       fetch_secret_callback_(fetch_secret_callback),
-      token_fetcher_(token_fetcher.Pass()),
+      token_fetcher_(std::move(token_fetcher)),
       method_set_by_host_(false),
       weak_factory_(this) {
   DCHECK(!methods.empty());
   for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin();
        it != methods.end(); ++it) {
     AddMethod(*it);
   }
 }
 
 NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() {
@@ skipping 53 matching lines @@
     // Include a list of supported methods.
     std::stringstream supported_methods(std::stringstream::out);
     for (std::vector<AuthenticationMethod>::iterator it = methods_.begin();
          it != methods_.end(); ++it) {
       if (it != methods_.begin())
         supported_methods << kSupportedMethodsSeparator;
       supported_methods << it->ToString();
     }
     result->AddAttr(kSupportedMethodsAttributeQName, supported_methods.str());
     state_ = WAITING_MESSAGE;
-    return result.Pass();
+    return result;
   }
   return GetNextMessageInternal();
 }
 
 void NegotiatingClientAuthenticator::CreateAuthenticatorForCurrentMethod(
     Authenticator::State preferred_initial_state,
     const base::Closure& resume_callback) {
   DCHECK(current_method_.is_valid());
   if (current_method_.type() == AuthenticationMethod::THIRD_PARTY) {
     // |ThirdPartyClientAuthenticator| takes ownership of |token_fetcher_|.
     // The authentication method negotiation logic should guarantee that only
     // one |ThirdPartyClientAuthenticator| will need to be created per session.
     DCHECK(token_fetcher_);
     current_authenticator_.reset(new ThirdPartyClientAuthenticator(
-        token_fetcher_.Pass()));
+        std::move(token_fetcher_)));
     resume_callback.Run();
   } else {
     DCHECK(current_method_.type() == AuthenticationMethod::SPAKE2 ||
            current_method_.type() == AuthenticationMethod::SPAKE2_PAIR);
     bool pairing_supported =
         (current_method_.type() == AuthenticationMethod::SPAKE2_PAIR);
     SecretFetchedCallback callback = base::Bind(
         &NegotiatingClientAuthenticator::CreateV2AuthenticatorWithSecret,
         weak_factory_.GetWeakPtr(), preferred_initial_state, resume_callback);
     fetch_secret_callback_.Run(pairing_supported, callback);
@@ skipping 19 matching lines @@
     const std::string& shared_secret) {
   current_authenticator_ = V2Authenticator::CreateForClient(
       AuthenticationMethod::ApplyHashFunction(
           current_method_.hash_function(), authentication_tag_, shared_secret),
       initial_state);
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting