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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2253233005: Change ScopedVector to vector<unique_ptr> in the password's UI code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android+ Created 4 years, 4 months 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_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
index e4c815acb048aef26aef2df1820a7f4543b1b323..4040655959e181ed255f2088cb74959d9e4b974b 100644
--- a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/passwords/manage_passwords_state.h"
+#include <iterator>
#include <utility>
#include <vector>
@@ -29,6 +30,16 @@ using ::testing::UnorderedElementsAre;
namespace {
+std::vector<const autofill::PasswordForm*> GetRawPointers(
+ const std::vector<std::unique_ptr<autofill::PasswordForm>>& forms) {
+ std::vector<const autofill::PasswordForm*> result;
+ std::transform(forms.begin(), forms.end(), std::back_inserter(result),
+ [](const std::unique_ptr<autofill::PasswordForm>& form) {
+ return form.get();
+ });
+ return result;
+}
+
class ManagePasswordsStateTest : public testing::Test {
public:
ManagePasswordsStateTest() : password_manager_(&stub_client_) {}
@@ -137,9 +148,9 @@ ManagePasswordsStateTest::CreateFormManagerInternal(bool include_federated) {
void ManagePasswordsStateTest::TestNoisyUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
- passwords_data_.GetCurrentForms();
+ GetRawPointers(passwords_data_.GetCurrentForms());
const std::vector<const autofill::PasswordForm*> federated_forms =
- passwords_data_.federated_credentials_forms();
+ GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
@@ -152,8 +163,9 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
password_manager::PasswordStoreChange::ADD, form);
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -162,8 +174,9 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
list[0] = password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::UPDATE, form);
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -171,17 +184,18 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
list[0] = password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::REMOVE, form);
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
}
void ManagePasswordsStateTest::TestAllUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
- passwords_data_.GetCurrentForms();
+ GetRawPointers(passwords_data_.GetCurrentForms());
const std::vector<const autofill::PasswordForm*> federated_forms =
- passwords_data_.federated_credentials_forms();
+ GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
EXPECT_NE(GURL::EmptyGURL(), origin);
@@ -196,7 +210,8 @@ void ManagePasswordsStateTest::TestAllUpdates() {
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(), Contains(Pointee(form)));
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -206,7 +221,8 @@ void ManagePasswordsStateTest::TestAllUpdates() {
password_manager::PasswordStoreChange::UPDATE, form);
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(), Contains(Pointee(form)));
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -214,8 +230,9 @@ void ManagePasswordsStateTest::TestAllUpdates() {
list[0] = password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::REMOVE, form);
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -224,9 +241,9 @@ void ManagePasswordsStateTest::TestAllUpdates() {
void ManagePasswordsStateTest::TestBlacklistedUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
- passwords_data_.GetCurrentForms();
+ GetRawPointers(passwords_data_.GetCurrentForms());
const std::vector<const autofill::PasswordForm*> federated_forms =
- passwords_data_.federated_credentials_forms();
+ GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
EXPECT_NE(GURL::EmptyGURL(), origin);
@@ -239,8 +256,9 @@ void ManagePasswordsStateTest::TestBlacklistedUpdates() {
list.push_back(password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::ADD, blacklisted));
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -248,15 +266,16 @@ void ManagePasswordsStateTest::TestBlacklistedUpdates() {
list[0] = password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::REMOVE, blacklisted);
passwords_data().ProcessLoginsChanged(list);
- EXPECT_EQ(forms, passwords_data().GetCurrentForms());
- EXPECT_EQ(federated_forms, passwords_data().federated_credentials_forms());
+ EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
+ EXPECT_EQ(federated_forms,
+ GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
}
TEST_F(ManagePasswordsStateTest, DefaultState) {
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -275,7 +294,7 @@ TEST_F(ManagePasswordsStateTest, PasswordSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -299,7 +318,7 @@ TEST_F(ManagePasswordsStateTest, PasswordSaved) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -316,14 +335,14 @@ TEST_F(ManagePasswordsStateTest, PasswordSubmittedFederationsPresent) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
- ScopedVector<autofill::PasswordForm> local_credentials;
- local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
- ScopedVector<autofill::PasswordForm> federated_credentials;
- federated_credentials.push_back(
+ std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
+ local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
+ std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials;
+ federated_credentials.emplace_back(
new autofill::PasswordForm(test_federated_form()));
const GURL origin = test_local_form().origin;
passwords_data().OnRequestCredentials(
@@ -332,7 +351,7 @@ TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(),
+ EXPECT_THAT(passwords_data().federation_providers_forms(),
ElementsAre(Pointee(test_federated_form())));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
passwords_data().state());
@@ -344,20 +363,20 @@ TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
EXPECT_TRUE(passwords_data().credentials_callback().is_null());
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
TestAllUpdates();
}
TEST_F(ManagePasswordsStateTest, AutoSignin) {
- ScopedVector<autofill::PasswordForm> local_credentials;
- local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
+ std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
+ local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
passwords_data().OnAutoSignin(std::move(local_credentials),
test_local_form().origin);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -365,7 +384,7 @@ TEST_F(ManagePasswordsStateTest, AutoSignin) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -389,7 +408,7 @@ TEST_F(ManagePasswordsStateTest, AutomaticPasswordSave) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_submitted_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -406,7 +425,7 @@ TEST_F(ManagePasswordsStateTest, AutomaticPasswordSaveWithFederations) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
UnorderedElementsAre(Pointee(test_submitted_form()),
Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, PasswordAutofilled) {
@@ -419,13 +438,10 @@ TEST_F(ManagePasswordsStateTest, PasswordAutofilled) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
- // |passwords_data| should hold a separate copy of test_local_form().
- EXPECT_THAT(passwords_data().GetCurrentForms(),
- Not(Contains(&test_local_form())));
TestAllUpdates();
}
@@ -446,7 +462,7 @@ TEST_F(ManagePasswordsStateTest, PasswordAutofillWithSavedFederations) {
UnorderedElementsAre(Pointee(test_local_form()),
Pointee(test_local_federated_form())));
// |federated_credentials_forms()| do not refer to the saved federations.
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
}
@@ -465,13 +481,10 @@ TEST_F(ManagePasswordsStateTest, ActiveOnMixedPSLAndNonPSLMatched) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
- // |passwords_data| should hold a separate copy of test_local_form().
- EXPECT_THAT(passwords_data().GetCurrentForms(),
- Not(Contains(&test_local_form())));
TestAllUpdates();
}
@@ -486,7 +499,7 @@ TEST_F(ManagePasswordsStateTest, InactiveOnPSLMatched) {
password_form_map, GURL("https://m.example.com/"), nullptr);
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -503,7 +516,7 @@ TEST_F(ManagePasswordsStateTest, OnInactive) {
passwords_data().state());
passwords_data().OnInactive();
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -524,10 +537,10 @@ TEST_F(ManagePasswordsStateTest, PendingPasswordAddBlacklisted) {
}
TEST_F(ManagePasswordsStateTest, RequestCredentialsAddBlacklisted) {
- ScopedVector<autofill::PasswordForm> local_credentials;
- local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
- ScopedVector<autofill::PasswordForm> federated_credentials;
- federated_credentials.push_back(
+ std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
+ local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
+ std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials;
+ federated_credentials.emplace_back(
new autofill::PasswordForm(test_federated_form()));
const GURL origin = test_local_form().origin;
passwords_data().OnRequestCredentials(
@@ -541,8 +554,8 @@ TEST_F(ManagePasswordsStateTest, RequestCredentialsAddBlacklisted) {
}
TEST_F(ManagePasswordsStateTest, AutoSigninAddBlacklisted) {
- ScopedVector<autofill::PasswordForm> local_credentials;
- local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
+ std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
+ local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
passwords_data().OnAutoSignin(std::move(local_credentials),
test_local_form().origin);
EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, passwords_data().state());
@@ -598,7 +611,7 @@ TEST_F(ManagePasswordsStateTest, PasswordUpdateSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -624,7 +637,7 @@ TEST_F(ManagePasswordsStateTest, AndroidPasswordUpdateSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(android_form)));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -647,13 +660,14 @@ TEST_F(ManagePasswordsStateTest, PasswordUpdateSubmittedWithFederations) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
UnorderedElementsAre(Pointee(test_local_form()),
Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
+ EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, ChooseCredentialLocal) {
- passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
- ScopedVector<autofill::PasswordForm>(),
- test_local_form().origin);
+ passwords_data().OnRequestCredentials(
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
EXPECT_CALL(*this, CredentialCallback(&test_local_form()));
@@ -661,9 +675,10 @@ TEST_F(ManagePasswordsStateTest, ChooseCredentialLocal) {
}
TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
- passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
- ScopedVector<autofill::PasswordForm>(),
- test_local_form().origin);
+ passwords_data().OnRequestCredentials(
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
password_manager::CredentialInfo credential_info(
@@ -674,9 +689,10 @@ TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
}
TEST_F(ManagePasswordsStateTest, ChooseCredentialLocalWithNonEmptyFederation) {
- passwords_data().OnRequestCredentials(ScopedVector<autofill::PasswordForm>(),
- ScopedVector<autofill::PasswordForm>(),
- test_local_form().origin);
+ passwords_data().OnRequestCredentials(
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ std::vector<std::unique_ptr<autofill::PasswordForm>>(),
+ test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
EXPECT_CALL(*this, CredentialCallback(&test_local_federated_form()));
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698