| Index: chrome/browser/password_manager/password_store_x_unittest.cc
|
| diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
|
| index e5246796cbd0cd475f8ec305e34929a2728fd5ab..3102e33ab16523c18726eddc2b91cda5ab74ed6d 100644
|
| --- a/chrome/browser/password_manager/password_store_x_unittest.cc
|
| +++ b/chrome/browser/password_manager/password_store_x_unittest.cc
|
| @@ -2,9 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include <stddef.h>
|
| +#include "chrome/browser/password_manager/password_store_x.h"
|
|
|
| +#include <stddef.h>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -18,7 +20,6 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/time/time.h"
|
| -#include "chrome/browser/password_manager/password_store_x.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "components/password_manager/core/browser/password_manager_test_utils.h"
|
| #include "components/password_manager/core/browser/password_store_change.h"
|
| @@ -93,7 +94,7 @@ class FailingBackend : public PasswordStoreX::NativeBackend {
|
| trash.origin = GURL(base::StringPrintf("http://trash%zu.com", i));
|
| forms.push_back(new PasswordForm(trash));
|
| }
|
| - return forms.Pass();
|
| + return forms;
|
| }
|
|
|
| bool GetLogins(const PasswordForm& form,
|
| @@ -251,7 +252,7 @@ void InitExpectedForms(bool autofillable,
|
| autofillable,
|
| false,
|
| static_cast<double>(i + 1)};
|
| - forms->push_back(CreatePasswordFormFromDataForTesting(data).Pass());
|
| + forms->push_back(CreatePasswordFormFromDataForTesting(data));
|
| }
|
| }
|
|
|
| @@ -305,7 +306,7 @@ TEST_P(PasswordStoreXTest, Notifications) {
|
| new password_manager::LoginDatabase(test_login_db_file_path()));
|
| scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
|
| base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
|
| - login_db.Pass(), GetBackend()));
|
| + std::move(login_db), GetBackend()));
|
| store->Init(syncer::SyncableService::StartSyncFlare());
|
|
|
| password_manager::PasswordFormData form_data = {
|
| @@ -406,7 +407,7 @@ TEST_P(PasswordStoreXTest, NativeMigration) {
|
| login_db.reset(new password_manager::LoginDatabase(login_db_file));
|
| scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
|
| base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
|
| - login_db.Pass(), GetBackend()));
|
| + std::move(login_db), GetBackend()));
|
| store->Init(syncer::SyncableService::StartSyncFlare());
|
|
|
| MockPasswordStoreConsumer consumer;
|
|
|