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 633924f50bfef4a9005876447593f30c99c35358..09eb842a632c41a12a0537259538cc5d2b43ab45 100644
--- a/components/password_manager/core/browser/affiliated_match_helper_unittest.cc
+++ b/components/password_manager/core/browser/affiliated_match_helper_unittest.cc
@@ -109,6 +109,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";
 
@@ -563,4 +565,34 @@ TEST_F(AffiliatedMatchHelperTest, DestroyBeforeDeferredInitialization) {
   ASSERT_NO_FATAL_FAILURE(RunDeferredInitialization());
 }
 
+TEST_F(AffiliatedMatchHelperTest, TrimAndroidUsernameOnlyCredentials) {
+  ScopedVector<autofill::PasswordForm> matched_forms;
+  matched_forms.push_back(make_scoped_ptr(new autofill::PasswordForm(
+      GetTestAndroidCredentials(kTestAndroidRealmBeta2))));
+  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);
+  username_only.skip_zero_click = false;
+  matched_forms.push_back(new autofill::PasswordForm(username_only));
+
+  AffiliatedMatchHelper::TrimAndroidUsernameOnlyCredentials(&matched_forms);
+
+  ASSERT_EQ(2u, matched_forms.size());
+
+  EXPECT_EQ(base::ASCIIToUTF16(kTestUsername),
+            matched_forms[0]->username_value);
+  EXPECT_EQ(base::ASCIIToUTF16(kTestPassword),
+            matched_forms[0]->password_value);
+  EXPECT_EQ(kTestAndroidRealmBeta2, matched_forms[0]->signon_realm);
+
+  EXPECT_EQ(base::ASCIIToUTF16(kTestUsername),
+            matched_forms[1]->username_value);
+  EXPECT_EQ(autofill::PasswordForm::SCHEME_USERNAME_ONLY,
+            matched_forms[1]->scheme);
+  EXPECT_EQ(GURL(kTestFederationURL), matched_forms[1]->federation_url);
+  EXPECT_TRUE(matched_forms[1]->skip_zero_click);
+}
 }  // namespace password_manager