Convert Pass()→std::move() in sync/

sync/util/cryptographer.cc

 // Copyright (c) 2012 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 "sync/util/cryptographer.h"
 
 #include <stddef.h>
-
 #include <algorithm>
+#include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/util/encryptor.h"
 
 namespace syncer {
 
 const char kNigoriTag[] = "google_chrome_nigori";
 
@@ skipping 144 matching lines @@
 
 bool Cryptographer::AddKey(const KeyParams& params) {
   // Create the new Nigori and make it the default encryptor.
   scoped_ptr<Nigori> nigori(new Nigori);
   if (!nigori->InitByDerivation(params.hostname,
                                 params.username,
                                 params.password)) {
     NOTREACHED();  // Invalid username or password.
     return false;
   }
-  return AddKeyImpl(nigori.Pass(), true);
+  return AddKeyImpl(std::move(nigori), true);
 }
 
 bool Cryptographer::AddNonDefaultKey(const KeyParams& params) {
   DCHECK(is_initialized());
   // Create the new Nigori and add it to the keybag.
   scoped_ptr<Nigori> nigori(new Nigori);
   if (!nigori->InitByDerivation(params.hostname,
                                 params.username,
                                 params.password)) {
     NOTREACHED();  // Invalid username or password.
     return false;
   }
-  return AddKeyImpl(nigori.Pass(), false);
+  return AddKeyImpl(std::move(nigori), false);
 }
 
 bool Cryptographer::AddKeyFromBootstrapToken(
     const std::string& restored_bootstrap_token) {
   // Create the new Nigori and make it the default encryptor.
   std::string serialized_nigori_key = UnpackBootstrapToken(
       restored_bootstrap_token);
   return ImportNigoriKey(serialized_nigori_key);
 }
 
@@ skipping 172 matching lines @@
   if (!key.ParseFromString(serialized_nigori_key))
     return false;
 
   scoped_ptr<Nigori> nigori(new Nigori);
   if (!nigori->InitByImport(key.user_key(), key.encryption_key(),
                             key.mac_key())) {
     NOTREACHED();
     return false;
   }
 
-  if (!AddKeyImpl(nigori.Pass(), true))
+  if (!AddKeyImpl(std::move(nigori), true))
     return false;
   return true;
 }
 
 }  // namespace syncer