Support Android username-only credentials.

components/password_manager/core/browser/affiliated_match_helper_unittest.cc

Index: components/password_manager/core/browser/affiliated_match_helper_unittest.cc
diff --git a/components/password_manager/core/browser/affiliated_match_helper_unittest.cc b/components/password_manager/core/browser/affiliated_match_helper_unittest.cc
index df14a14bfcdd00b0ed505b9bede8bb95985e743f..cef9cf5447de7aaff1b53ebe675321d2f92c5892 100644
--- a/components/password_manager/core/browser/affiliated_match_helper_unittest.cc
+++ b/components/password_manager/core/browser/affiliated_match_helper_unittest.cc
@@ -110,6 +110,8 @@ const char kTestAndroidFacetURIGamma[] =
 const char kTestAndroidRealmGamma[] =
     "android://hash@com.example.gamma.android";
 
+const char kTestFederationURL[] = "https://google.com/";
+
 const char kTestUsername[] = "JohnDoe";
 const char kTestPassword[] = "secret";
 
@@ -578,12 +580,19 @@ TEST_F(AffiliatedMatchHelperTest, TransformAffiliatedAndroidCredentials) {
       GetTestAndroidCredentials(kTestAndroidRealmBeta3))));
   matched_forms[1]->username_value = base::ASCIIToUTF16(kTestUsername2);
   matched_forms[1]->password_value = base::ASCIIToUTF16(kTestPassword2);
+  autofill::PasswordForm username_only;
+  username_only.scheme = autofill::PasswordForm::SCHEME_USERNAME_ONLY;
+  username_only.signon_realm = kTestAndroidRealmGamma;
+  username_only.username_value = base::ASCIIToUTF16(kTestUsername);
+  matched_forms.push_back(new autofill::PasswordForm(username_only));
+  username_only.federation_url = GURL(kTestFederationURL);

[engedy, 2015/10/08 17:31:01]

Please either set |skip_zero_click| to false explicitly here.

[vasilii, 2015/10/12 15:12:48]

Done.

+  matched_forms.push_back(new autofill::PasswordForm(username_only));
 
   ScopedVector<autofill::PasswordForm> transformed_forms =
       AffiliatedMatchHelper::TransformAffiliatedAndroidCredentials(
           observed_form, matched_forms.Pass());
 
-  ASSERT_EQ(2u, transformed_forms.size());
+  ASSERT_EQ(3u, transformed_forms.size());

[Mike West, 2015/09/29 09:36:09]

Why isn't this 4? You're adding two distinct forms above, one federated, one
username only?

[engedy, 2015/10/08 17:31:01]

If I understand correctly, the non-federated credential is ought to be removed.

[vasilii, 2015/10/12 15:12:48]

Acknowledged.

 
   EXPECT_EQ(base::ASCIIToUTF16(kTestUsername),
             transformed_forms[0]->username_value);
@@ -602,6 +611,12 @@ TEST_F(AffiliatedMatchHelperTest, TransformAffiliatedAndroidCredentials) {
   EXPECT_EQ(kTestWebRealmBeta1, transformed_forms[1]->signon_realm);
   EXPECT_EQ(kTestAndroidRealmBeta3,
             transformed_forms[1]->original_signon_realm);
+
+  EXPECT_EQ(base::ASCIIToUTF16(kTestUsername),
+            transformed_forms[2]->username_value);
+  EXPECT_EQ(autofill::PasswordForm::SCHEME_USERNAME_ONLY,
+            transformed_forms[2]->scheme);
+  EXPECT_TRUE(transformed_forms[2]->skip_zero_click);
 }
 
 }  // namespace password_manager