Show PSL-matched credentials in the account chooser.

components/password_manager/content/browser/credential_manager_impl_unittest.cc

Index: components/password_manager/content/browser/credential_manager_impl_unittest.cc
diff --git a/components/password_manager/content/browser/credential_manager_impl_unittest.cc b/components/password_manager/content/browser/credential_manager_impl_unittest.cc
index e9337abff99c746f94348e47b38bf77d722948d2..ccf6bc92473ea0dabf01f80328c04796b83cb876 100644
--- a/components/password_manager/content/browser/credential_manager_impl_unittest.cc
+++ b/components/password_manager/content/browser/credential_manager_impl_unittest.cc
@@ -227,7 +227,7 @@ class CredentialManagerImplTest : public content::RenderViewHostTestHarness {
     form_.icon_url = GURL("https://example.com/icon.png");
     form_.password_value = base::ASCIIToUTF16("Password");
     form_.origin = web_contents()->GetLastCommittedURL().GetOrigin();
-    form_.signon_realm = form_.origin.spec();
+    form_.signon_realm = form_.origin.GetOrigin().spec();
     form_.scheme = autofill::PasswordForm::SCHEME_HTML;
     form_.skip_zero_click = false;
 
@@ -251,7 +251,8 @@ class CredentialManagerImplTest : public content::RenderViewHostTestHarness {
     origin_path_form_.display_name = base::ASCIIToUTF16("Display Name 2");
     origin_path_form_.password_value = base::ASCIIToUTF16("Password 2");
     origin_path_form_.origin = GURL("https://example.com/path");
-    origin_path_form_.signon_realm = origin_path_form_.origin.spec();
+    origin_path_form_.signon_realm =
+        origin_path_form_.origin.GetOrigin().spec();
     origin_path_form_.scheme = autofill::PasswordForm::SCHEME_HTML;
     origin_path_form_.skip_zero_click = false;
 
@@ -259,7 +260,7 @@ class CredentialManagerImplTest : public content::RenderViewHostTestHarness {
     subdomain_form_.display_name = base::ASCIIToUTF16("Display Name 2");
     subdomain_form_.password_value = base::ASCIIToUTF16("Password 2");
     subdomain_form_.origin = GURL("https://subdomain.example.com/path");
-    subdomain_form_.signon_realm = subdomain_form_.origin.spec();
+    subdomain_form_.signon_realm = subdomain_form_.origin.GetOrigin().spec();
     subdomain_form_.scheme = autofill::PasswordForm::SCHEME_HTML;
     subdomain_form_.skip_zero_click = false;
 
@@ -267,7 +268,8 @@ class CredentialManagerImplTest : public content::RenderViewHostTestHarness {
     cross_origin_form_.display_name = base::ASCIIToUTF16("Display Name");
     cross_origin_form_.password_value = base::ASCIIToUTF16("Password");
     cross_origin_form_.origin = GURL("https://example.net/");
-    cross_origin_form_.signon_realm = cross_origin_form_.origin.spec();
+    cross_origin_form_.signon_realm =
+        cross_origin_form_.origin.GetOrigin().spec();
     cross_origin_form_.scheme = autofill::PasswordForm::SCHEME_HTML;
     cross_origin_form_.skip_zero_click = false;
 
@@ -735,6 +737,17 @@ TEST_F(CredentialManagerImplTest,
 }
 
 TEST_F(CredentialManagerImplTest,
+       CredentialManagerOnRequestCredentialWithPSLCredential) {
+  subdomain_form_.skip_zero_click = false;

[vabr (Chromium), 2016/11/23 18:49:11]

Is the skip_zero_click bit being false a part of the contract? Or is the get()
call expected to ignore that value and pretend it is false?

In the first case, we should maybe point the contract out in a comment.

In the second case, we may need to do two tests, for both values of the flag, to
verify that the get() call handles them correctly.

[vasilii, 2016/11/24 12:44:10]

It's the second. The test should pass with any value of the flag.
skip_zero_click == false makes it more likely to fail. I can't think of an
implementation where the test passes with skip_zero_click == false and fails
with skip_zero_click == true.
I added a test to check that PSL credentials are not returned for zero-click
only get().

[vabr (Chromium), 2016/11/24 13:58:14]

Acknowledged.

+  store_->AddLogin(subdomain_form_);
+  EXPECT_CALL(*client_, PromptUserToChooseCredentialsPtr(_, _, _));
+  EXPECT_CALL(*client_, NotifyUserAutoSigninPtr()).Times(0);
+
+  ExpectCredentialType(false, true, std::vector<GURL>(),
+                       CredentialType::CREDENTIAL_TYPE_PASSWORD);
+}
+
+TEST_F(CredentialManagerImplTest,
        CredentialManagerOnRequestCredentialWithEmptyAndNonemptyUsernames) {
   store_->AddLogin(form_);
   autofill::PasswordForm empty = form_;
@@ -743,6 +756,7 @@ TEST_F(CredentialManagerImplTest,
   autofill::PasswordForm duplicate = form_;
   duplicate.username_element = base::ASCIIToUTF16("different_username_element");
   store_->AddLogin(duplicate);
+  store_->AddLogin(subdomain_form_);
 
   std::vector<GURL> federations;
   ExpectZeroClickSignInSuccess(false, true, federations,
@@ -759,9 +773,8 @@ TEST_F(CredentialManagerImplTest,
   autofill::PasswordForm empty = form_;
   empty.username_value.clear();
   store_->AddLogin(empty);
-  autofill::PasswordForm duplicate = form_;
-  duplicate.username_element = base::ASCIIToUTF16("username_element1");
-  duplicate.is_public_suffix_match = true;
+  autofill::PasswordForm duplicate = subdomain_form_;
+  duplicate.username_value = form_.username_value;
   store_->AddLogin(duplicate);
   duplicate = form_;
   duplicate.username_element = base::ASCIIToUTF16("username_element2");
@@ -770,9 +783,9 @@ TEST_F(CredentialManagerImplTest,
 
   origin_path_form_.preferred = true;
   store_->AddLogin(origin_path_form_);
-  duplicate = origin_path_form_;
+  duplicate = subdomain_form_;
   duplicate.username_element = base::ASCIIToUTF16("username_element3");
-  duplicate.is_public_suffix_match = true;
+  duplicate.username_value = subdomain_form_.username_value;
   store_->AddLogin(duplicate);
   duplicate = origin_path_form_;
   duplicate.username_element = base::ASCIIToUTF16("username_element4");
@@ -848,16 +861,7 @@ TEST_F(
       .Times(testing::Exactly(0));
   EXPECT_CALL(*client_, NotifyUserAutoSigninPtr()).Times(testing::Exactly(0));
 
-  bool called = false;
-  mojom::CredentialManagerError error;
-  base::Optional<CredentialInfo> credential;
-  CallGet(true, true, federations,
-          base::Bind(&GetCredentialCallback, &called, &error, &credential));
-
-  RunAllPendingTasks();
-
-  EXPECT_TRUE(called);
-  EXPECT_EQ(mojom::CredentialManagerError::SUCCESS, error);
+  ExpectZeroClickSignInFailure(true, true, federations);
 }
 
 TEST_F(CredentialManagerImplTest,