Fix PasswordForm operator== and operator<< and update one reliant test.

BUG=437865

Review URL: https://codereview.chromium.org/1018613002

Cr-Commit-Position: refs/heads/master@{#320944}

components/autofill/core/common/password_form.cc

@@ -32,7 +32,9 @@ bool PasswordForm::IsPublicSuffixMatch() const {
 }
 
 bool PasswordForm::operator==(const PasswordForm& form) const {
-  return signon_realm == form.signon_realm &&
+  return scheme == form.scheme &&
+      signon_realm == form.signon_realm &&
+      original_signon_realm == form.original_signon_realm &&
       origin == form.origin &&
       action == form.action &&
       submit_element == form.submit_element &&
@@ -67,6 +69,7 @@ bool PasswordForm::operator!=(const PasswordForm& form) const {
 std::ostream& operator<<(std::ostream& os, const PasswordForm& form) {
   return os << "scheme: " << form.scheme
             << " signon_realm: " << form.signon_realm
+            << " original_signon_realm: " << form.original_signon_realm
             << " origin: " << form.origin
             << " action: " << form.action
             << " submit_element: " << base::UTF16ToUTF8(form.submit_element)

components/password_manager/core/browser/password_form_manager_unittest.cc

@@ -399,6 +399,8 @@ TEST_F(PasswordFormManagerTest, PSLMatchedCredentialsMetadataUpdated) {
   expected_saved_form.other_possible_usernames.clear();
   expected_saved_form.form_data = saved_match()->form_data;
   expected_saved_form.origin = saved_match()->origin;
+  expected_saved_form.original_signon_realm =
+      saved_match()->original_signon_realm;
   PasswordForm actual_saved_form;
 
   EXPECT_CALL(*(client_with_store.mock_driver()->mock_autofill_manager()),