Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1282)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('k') | chrome/browser/ui/passwords/password_manager_presenter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index d908ddb8b15d31b09adc62f2758c189b12050d82..b2abe94c880322212cad159cbbc2ba7fc3c637f7 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -211,8 +211,8 @@ ManagePasswordsUIControllerTest::CreateFormManagerWithBestMatches(
driver_.AsWeakPtr(),
observed_form, true));
test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
- test_form_manager->OnGetPasswordStoreResults(best_matches.Pass());
- return test_form_manager.Pass();
+ test_form_manager->OnGetPasswordStoreResults(std::move(best_matches));
+ return test_form_manager;
}
scoped_ptr<password_manager::PasswordFormManager>
@@ -220,7 +220,7 @@ ManagePasswordsUIControllerTest::CreateFormManager() {
ScopedVector<autofill::PasswordForm> stored_forms;
stored_forms.push_back(new autofill::PasswordForm(test_local_form()));
return CreateFormManagerWithBestMatches(test_local_form(),
- stored_forms.Pass());
+ std::move(stored_forms));
}
TEST_F(ManagePasswordsUIControllerTest, DefaultState) {
@@ -256,7 +256,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
controller()->GetState());
EXPECT_TRUE(controller()->opened_bubble());
@@ -273,9 +273,10 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedFormPasswordSubmitted) {
ScopedVector<autofill::PasswordForm> stored_forms;
stored_forms.push_back(new autofill::PasswordForm(blacklisted));
scoped_ptr<password_manager::PasswordFormManager> test_form_manager =
- CreateFormManagerWithBestMatches(test_local_form(), stored_forms.Pass());
+ CreateFormManagerWithBestMatches(test_local_form(),
+ std::move(stored_forms));
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
controller()->GetState());
EXPECT_FALSE(controller()->opened_bubble());
@@ -299,7 +300,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleSuppressed) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
controller()->GetState());
EXPECT_FALSE(controller()->opened_bubble());
@@ -326,7 +327,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleNotSuppressed) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
controller()->GetState());
EXPECT_TRUE(controller()->opened_bubble());
@@ -342,7 +343,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSaved) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
controller()->SavePassword();
ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
@@ -354,7 +355,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordBlacklisted) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
controller()->NeverSavePassword();
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
@@ -363,7 +364,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordBlacklisted) {
TEST_F(ManagePasswordsUIControllerTest, RedirectNavigations) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
// Fake-redirect. We expect the bubble's state to persist so a user reasonably
@@ -379,7 +380,7 @@ TEST_F(ManagePasswordsUIControllerTest, RedirectNavigations) {
TEST_F(ManagePasswordsUIControllerTest, NormalNavigations) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
// Fake-navigate. We expect the bubble's state to be reset.
@@ -399,7 +400,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedToNonWebbyURL) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnPasswordSubmitted(test_form_manager.Pass());
+ controller()->OnPasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
@@ -430,7 +431,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutomaticPasswordSave) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
- controller()->OnAutomaticPasswordSave(test_form_manager.Pass());
+ controller()->OnAutomaticPasswordSave(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, controller()->GetState());
controller()->OnBubbleHidden();
@@ -443,7 +444,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {
ScopedVector<autofill::PasswordForm> federated_credentials;
GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(), federated_credentials.Pass(), origin,
+ std::move(local_credentials), std::move(federated_credentials), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
@@ -474,7 +475,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) {
ScopedVector<autofill::PasswordForm> federated_credentials;
GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(), federated_credentials.Pass(), origin,
+ std::move(local_credentials), std::move(federated_credentials), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
@@ -506,7 +507,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {
new autofill::PasswordForm(test_local_form()));
GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(), federated_credentials.Pass(), origin,
+ std::move(local_credentials), std::move(federated_credentials), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
@@ -534,7 +535,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
ScopedVector<autofill::PasswordForm> federated_credentials;
GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(), federated_credentials.Pass(), origin,
+ std::move(local_credentials), std::move(federated_credentials), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
@@ -555,7 +556,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
TEST_F(ManagePasswordsUIControllerTest, AutoSignin) {
ScopedVector<autofill::PasswordForm> local_credentials;
local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
- controller()->OnAutoSignin(local_credentials.Pass());
+ controller()->OnAutoSignin(std::move(local_credentials));
EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState());
EXPECT_EQ(test_local_form().origin, controller()->GetOrigin());
ASSERT_FALSE(controller()->GetCurrentForms().empty());
@@ -568,7 +569,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutoSignin) {
TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
ScopedVector<autofill::PasswordForm> local_credentials;
local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
- controller()->OnAutoSignin(local_credentials.Pass());
+ controller()->OnAutoSignin(std::move(local_credentials));
ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
scoped_ptr<autofill::PasswordForm> test_form(
new autofill::PasswordForm(test_local_form()));
@@ -595,7 +596,7 @@ TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
- controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass());
+ controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
controller()->GetState());
@@ -608,7 +609,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordUpdated) {
test_form_manager->ProvisionallySave(
test_local_form(),
password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
- controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass());
+ controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE);
controller()->UpdatePassword(autofill::PasswordForm());
@@ -618,7 +619,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordUpdated) {
TEST_F(ManagePasswordsUIControllerTest, NavigationWhenUpdateBubbleActive) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
- controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass());
+ controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
controller()->GetState());
controller()->DidNavigateMainFrame(content::LoadCommittedDetails(),
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('k') | chrome/browser/ui/passwords/password_manager_presenter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698