Convert Pass()→std::move() for Mac build.

chrome/browser/password_manager/password_store_proxy_mac.cc

 // Copyright 2015 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 "chrome/browser/password_manager/password_store_proxy_mac.h"
 
 #include <string>
+#include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/password_manager/password_store_mac.h"
 #include "chrome/browser/password_manager/simple_password_store_mac.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/apple_keychain.h"
 
 using password_manager::MigrationStatus;
 using password_manager::PasswordStoreChangeList;
 
 PasswordStoreProxyMac::PasswordStoreProxyMac(
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
     scoped_ptr<crypto::AppleKeychain> keychain,
     scoped_ptr<password_manager::LoginDatabase> login_db,
     PrefService* prefs)
     : PasswordStore(main_thread_runner, nullptr),
-      login_metadata_db_(login_db.Pass()) {
+      login_metadata_db_(std::move(login_db)) {
   DCHECK(login_metadata_db_);
   migration_status_.Init(password_manager::prefs::kKeychainMigrationStatus,
                          prefs);
   if (migration_status_.GetValue() ==
       static_cast<int>(MigrationStatus::MIGRATED)) {
     // The login database will be set later after initialization.
     password_store_simple_ =
         new SimplePasswordStoreMac(main_thread_runner, nullptr, nullptr);
   } else {
     password_store_mac_ =
-        new PasswordStoreMac(main_thread_runner, nullptr, keychain.Pass());
+        new PasswordStoreMac(main_thread_runner, nullptr, std::move(keychain));
   }
 }
 
 PasswordStoreProxyMac::~PasswordStoreProxyMac() {
 }
 
 bool PasswordStoreProxyMac::Init(
     const syncer::SyncableService::StartSyncFlare& flare) {
   // Set up a background thread.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 43 matching lines @@
 
 void PasswordStoreProxyMac::InitOnBackgroundThread(MigrationStatus status) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
   if (!login_metadata_db_->Init()) {
     login_metadata_db_.reset();
     LOG(ERROR) << "Could not create/open login database.";
   }
 
   if (status == MigrationStatus::MIGRATED) {
     password_store_simple_->InitWithTaskRunner(GetBackgroundTaskRunner(),
-                                               login_metadata_db_.Pass());
+                                               std::move(login_metadata_db_));
   } else {
     password_store_mac_->set_login_metadata_db(login_metadata_db_.get());
     password_store_mac_->InitWithTaskRunner(GetBackgroundTaskRunner());
     if (login_metadata_db_ && (status == MigrationStatus::NOT_STARTED ||
                                status == MigrationStatus::FAILED_ONCE)) {
       // Let's try to migrate the passwords.
       if (password_store_mac_->ImportFromKeychain() ==
           PasswordStoreMac::MIGRATION_OK) {
         status = MigrationStatus::MIGRATED;
         // Switch from |password_store_mac_| to |password_store_simple_|.
         password_store_mac_->set_login_metadata_db(nullptr);
         pending_ui_tasks_.push_back(base::Bind(
             &PasswordStoreMac::ShutdownOnUIThread, password_store_mac_));
         password_store_mac_ = nullptr;
         DCHECK(!password_store_simple_);
         password_store_simple_ = new SimplePasswordStoreMac(
             main_thread_runner_, GetBackgroundTaskRunner(),
-            login_metadata_db_.Pass());
+            std::move(login_metadata_db_));
       } else {
         status = (status == MigrationStatus::FAILED_ONCE
                       ? MigrationStatus::FAILED_TWICE
                       : MigrationStatus::FAILED_ONCE);
       }
       pending_ui_tasks_.push_back(
           base::Bind(&PasswordStoreProxyMac::UpdateStatusPref, this, status));
     }
   }
   if (!pending_ui_tasks_.empty()) {
@@ skipping 89 matching lines @@
 }
 
 void PasswordStoreProxyMac::RemoveSiteStatsImpl(const GURL& origin_domain) {
   GetBackend()->RemoveSiteStatsImpl(origin_domain);
 }
 
 std::vector<scoped_ptr<password_manager::InteractionsStats>>
 PasswordStoreProxyMac::GetSiteStatsImpl(const GURL& origin_domain) {
   return GetBackend()->GetSiteStatsImpl(origin_domain);
 }