OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" | 9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" |
10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" | 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 ManagePasswordsIconMock mock; | 340 ManagePasswordsIconMock mock; |
341 controller()->UpdateIconAndBubbleState(&mock); | 341 controller()->UpdateIconAndBubbleState(&mock); |
342 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state()); | 342 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state()); |
343 | 343 |
344 controller()->ManagePasswordsUIController::ChooseCredential(true, | 344 controller()->ManagePasswordsUIController::ChooseCredential(true, |
345 test_form()); | 345 test_form()); |
346 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); | 346 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); |
347 ASSERT_TRUE(credential_info()); | 347 ASSERT_TRUE(credential_info()); |
348 EXPECT_EQ(test_form().username_value, credential_info()->id); | 348 EXPECT_EQ(test_form().username_value, credential_info()->id); |
349 EXPECT_EQ(test_form().password_value, credential_info()->password); | 349 EXPECT_EQ(test_form().password_value, credential_info()->password); |
350 EXPECT_EQ(password_manager::CREDENTIAL_TYPE_LOCAL, credential_info()->type); | 350 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL, |
| 351 credential_info()->type); |
351 } | 352 } |
352 | 353 |
353 TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) { | 354 TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) { |
354 ScopedVector<autofill::PasswordForm> local_credentials; | 355 ScopedVector<autofill::PasswordForm> local_credentials; |
355 local_credentials.push_back(new autofill::PasswordForm(test_form())); | 356 local_credentials.push_back(new autofill::PasswordForm(test_form())); |
356 ScopedVector<autofill::PasswordForm> federated_credentials; | 357 ScopedVector<autofill::PasswordForm> federated_credentials; |
357 EXPECT_TRUE(controller()->OnChooseCredentials( | 358 EXPECT_TRUE(controller()->OnChooseCredentials( |
358 local_credentials.Pass(), | 359 local_credentials.Pass(), |
359 federated_credentials.Pass(), | 360 federated_credentials.Pass(), |
360 base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback, | 361 base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback, |
361 base::Unretained(this)))); | 362 base::Unretained(this)))); |
362 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE, | 363 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE, |
363 controller()->state()); | 364 controller()->state()); |
364 | 365 |
365 controller()->ManagePasswordsUIController::ChooseCredential(false, | 366 controller()->ManagePasswordsUIController::ChooseCredential(false, |
366 test_form()); | 367 test_form()); |
367 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); | 368 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); |
368 ASSERT_TRUE(credential_info()); | 369 ASSERT_TRUE(credential_info()); |
369 EXPECT_EQ(password_manager::CREDENTIAL_TYPE_EMPTY, credential_info()->type); | 370 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY, |
| 371 credential_info()->type); |
370 } | 372 } |
371 | 373 |
372 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) { | 374 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) { |
373 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 375 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
374 autofill::PasswordFormMap map; | 376 autofill::PasswordFormMap map; |
375 autofill::PasswordForm psl_matched_test_form = test_form(); | 377 autofill::PasswordForm psl_matched_test_form = test_form(); |
376 psl_matched_test_form.original_signon_realm = "http://pslmatched.example.com"; | 378 psl_matched_test_form.original_signon_realm = "http://pslmatched.example.com"; |
377 map[kTestUsername] = &psl_matched_test_form; | 379 map[kTestUsername] = &psl_matched_test_form; |
378 controller()->OnPasswordAutofilled(map); | 380 controller()->OnPasswordAutofilled(map); |
379 | 381 |
380 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); | 382 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); |
381 } | 383 } |
OLD | NEW |