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

remoting/protocol/pairing_authenticator_base.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/pairing_authenticator_base.h"
 
 #include "base/bind.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/channel_authenticator.h"
 
@@ skipping 73 matching lines @@
       message,
       base::Bind(&PairingAuthenticatorBase::CheckForFailedSpakeExchange,
                  weak_factory_.GetWeakPtr(), resume_callback));
 }
 
 scoped_ptr<buzz::XmlElement> PairingAuthenticatorBase::GetNextMessage() {
   DCHECK_EQ(state(), MESSAGE_READY);
   scoped_ptr<buzz::XmlElement> result = v2_authenticator_->GetNextMessage();
   AddPairingElements(result.get());
   MaybeAddErrorMessage(result.get());
-  return result.Pass();
+  return result;
 }
 
 const std::string& PairingAuthenticatorBase::GetAuthKey() const {
   return v2_authenticator_->GetAuthKey();
 }
 
 scoped_ptr<ChannelAuthenticator>
 PairingAuthenticatorBase::CreateChannelAuthenticator() const {
   return v2_authenticator_->CreateChannelAuthenticator();
 }
@@ skipping 41 matching lines @@
   resume_callback.Run();
 }
 
 void PairingAuthenticatorBase::SetAuthenticatorAndProcessMessage(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback,
     scoped_ptr<Authenticator> authenticator) {
   DCHECK(!v2_authenticator_);
   DCHECK(authenticator);
   waiting_for_authenticator_ = false;
-  v2_authenticator_ = authenticator.Pass();
+  v2_authenticator_ = std::move(authenticator);
   if (message) {
     ProcessMessage(message, resume_callback);
   } else {
     resume_callback.Run();
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting