CREDENTIAL: Persist PasswordForm's primary key through CredentialInfo.

components/password_manager/core/common/credential_manager_types_unittest.cc

Index: components/password_manager/core/common/credential_manager_types_unittest.cc
diff --git a/components/password_manager/core/common/credential_manager_types_unittest.cc b/components/password_manager/core/common/credential_manager_types_unittest.cc
index 75fefb28c38af8fec26c0e5b046be28b7033c91e..41edb2f1d0280f8a1e5bda4aecbf4cbb231d5c2f 100644
--- a/components/password_manager/core/common/credential_manager_types_unittest.cc
+++ b/components/password_manager/core/common/credential_manager_types_unittest.cc
@@ -69,6 +69,8 @@ TEST_F(CredentialManagerTypesTest, CreatePasswordFormLocal) {
   info.name = base::ASCIIToUTF16("name");
   info.icon = icon_;
   info.password = base::ASCIIToUTF16("password");
+  info.username_element = base::ASCIIToUTF16("username_element");
+  info.password_element = base::ASCIIToUTF16("password_element");
   info.type = CredentialType::CREDENTIAL_TYPE_PASSWORD;
 
   form = CreatePasswordFormFromCredentialInfo(info, origin_);
@@ -76,6 +78,8 @@ TEST_F(CredentialManagerTypesTest, CreatePasswordFormLocal) {
 
   EXPECT_EQ(info.icon, form->icon_url);
   EXPECT_EQ(info.name, form->display_name);
+  EXPECT_EQ(info.username_element, form->username_element);
+  EXPECT_EQ(info.password_element, form->password_element);
   EXPECT_EQ(origin_, form->origin);
   EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, form->scheme);
 
@@ -85,4 +89,25 @@ TEST_F(CredentialManagerTypesTest, CreatePasswordFormLocal) {
   EXPECT_EQ(info.password, form->password_value);
   EXPECT_EQ(origin_.spec(), form->signon_realm);
 }
+
+TEST_F(CredentialManagerTypesTest, CreatePasswordFormOverrideSignon) {
+  CredentialInfo info;
+  scoped_ptr<autofill::PasswordForm> form;
+
+  info.id = base::ASCIIToUTF16("id");
+  info.name = base::ASCIIToUTF16("name");
+  info.icon = icon_;
+  info.password = base::ASCIIToUTF16("password");
+  info.username_element = base::ASCIIToUTF16("username_element");
+  info.password_element = base::ASCIIToUTF16("password_element");
+  info.signon_realm = "signon realm!";
+  info.type = CredentialType::CREDENTIAL_TYPE_PASSWORD;
+
+  form = CreatePasswordFormFromCredentialInfo(info, origin_);
+  ASSERT_NE(nullptr, form.get());
+
+  // If the form has a signon realm set, it overrides the default.
+  EXPECT_EQ("signon realm!", form->signon_realm);
+}
+
 }  // namespace password_manager