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

Side by Side Diff: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

Issue 1402803002: [Password Manager] Pass origin of the form which was autofilled in order to display it in managemen… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/passwords/manage_passwords_state.h" 5 #include "chrome/browser/ui/passwords/manage_passwords_state.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/password_manager/core/browser/password_form_manager.h" 10 #include "components/password_manager/core/browser/password_form_manager.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state()); 342 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
343 EXPECT_EQ(test_submitted_form().origin, passwords_data().origin()); 343 EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
344 TestAllUpdates(); 344 TestAllUpdates();
345 } 345 }
346 346
347 TEST_F(ManagePasswordsStateTest, PasswordAutofilled) { 347 TEST_F(ManagePasswordsStateTest, PasswordAutofilled) {
348 autofill::PasswordFormMap password_form_map; 348 autofill::PasswordFormMap password_form_map;
349 password_form_map.insert( 349 password_form_map.insert(
350 test_local_form().username_value, 350 test_local_form().username_value,
351 make_scoped_ptr(new autofill::PasswordForm(test_local_form()))); 351 make_scoped_ptr(new autofill::PasswordForm(test_local_form())));
352 passwords_data().OnPasswordAutofilled(password_form_map); 352 GURL origin("https://example.com");
353 passwords_data().OnPasswordAutofilled(password_form_map, origin);
353 354
354 EXPECT_THAT(passwords_data().GetCurrentForms(), 355 EXPECT_THAT(passwords_data().GetCurrentForms(),
355 ElementsAre(Pointee(test_local_form()))); 356 ElementsAre(Pointee(test_local_form())));
356 EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty()); 357 EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
357 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state()); 358 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
358 EXPECT_EQ(test_local_form().origin, passwords_data().origin()); 359 EXPECT_EQ(origin, passwords_data().origin());
359 360
360 // |passwords_data| should hold a separate copy of test_local_form(). 361 // |passwords_data| should hold a separate copy of test_local_form().
361 EXPECT_THAT(passwords_data().GetCurrentForms(), 362 EXPECT_THAT(passwords_data().GetCurrentForms(),
362 Not(Contains(&test_local_form()))); 363 Not(Contains(&test_local_form())));
363 TestAllUpdates(); 364 TestAllUpdates();
364 } 365 }
365 366
366 TEST_F(ManagePasswordsStateTest, InactiveOnPSLMatched) { 367 TEST_F(ManagePasswordsStateTest, InactiveOnPSLMatched) {
367 autofill::PasswordForm psl_matched_test_form = test_local_form(); 368 autofill::PasswordForm psl_matched_test_form = test_local_form();
368 psl_matched_test_form.is_public_suffix_match = true; 369 psl_matched_test_form.is_public_suffix_match = true;
369 autofill::PasswordFormMap password_form_map; 370 autofill::PasswordFormMap password_form_map;
370 password_form_map.insert( 371 password_form_map.insert(
371 psl_matched_test_form.username_value, 372 psl_matched_test_form.username_value,
372 make_scoped_ptr(new autofill::PasswordForm(psl_matched_test_form))); 373 make_scoped_ptr(new autofill::PasswordForm(psl_matched_test_form)));
373 passwords_data().OnPasswordAutofilled(password_form_map); 374 passwords_data().OnPasswordAutofilled(password_form_map,
375 GURL("https://m.example.com/"));
374 376
375 EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty()); 377 EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
376 EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty()); 378 EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
377 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state()); 379 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
378 EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin()); 380 EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
379 EXPECT_FALSE(passwords_data().form_manager()); 381 EXPECT_FALSE(passwords_data().form_manager());
380 } 382 }
381 383
382 TEST_F(ManagePasswordsStateTest, OnInactive) { 384 TEST_F(ManagePasswordsStateTest, OnInactive) {
383 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( 385 scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, passwords_data().state()); 449 EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, passwords_data().state());
448 450
449 TestBlacklistedUpdates(); 451 TestBlacklistedUpdates();
450 } 452 }
451 453
452 TEST_F(ManagePasswordsStateTest, BackgroundAutofilledAddBlacklisted) { 454 TEST_F(ManagePasswordsStateTest, BackgroundAutofilledAddBlacklisted) {
453 autofill::PasswordFormMap password_form_map; 455 autofill::PasswordFormMap password_form_map;
454 password_form_map.insert( 456 password_form_map.insert(
455 test_local_form().username_value, 457 test_local_form().username_value,
456 make_scoped_ptr(new autofill::PasswordForm(test_local_form()))); 458 make_scoped_ptr(new autofill::PasswordForm(test_local_form())));
457 passwords_data().OnPasswordAutofilled(password_form_map); 459 passwords_data().OnPasswordAutofilled(
460 password_form_map, password_form_map.begin()->second->origin);
458 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state()); 461 EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
459 462
460 TestBlacklistedUpdates(); 463 TestBlacklistedUpdates();
461 } 464 }
462 465
463 TEST_F(ManagePasswordsStateTest, PasswordUpdateAddBlacklisted) { 466 TEST_F(ManagePasswordsStateTest, PasswordUpdateAddBlacklisted) {
464 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( 467 scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
465 CreateFormManager()); 468 CreateFormManager());
466 test_form_manager->ProvisionallySave( 469 test_form_manager->ProvisionallySave(
467 test_submitted_form(), 470 test_submitted_form(),
(...skipping 19 matching lines...) Expand all
487 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, 490 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
488 passwords_data().state()); 491 passwords_data().state());
489 EXPECT_EQ(test_submitted_form().origin, passwords_data().origin()); 492 EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
490 ASSERT_TRUE(passwords_data().form_manager()); 493 ASSERT_TRUE(passwords_data().form_manager());
491 EXPECT_EQ(test_submitted_form(), 494 EXPECT_EQ(test_submitted_form(),
492 passwords_data().form_manager()->pending_credentials()); 495 passwords_data().form_manager()->pending_credentials());
493 TestAllUpdates(); 496 TestAllUpdates();
494 } 497 }
495 498
496 } // namespace 499 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698