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

components/autofill/core/common/password_form.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <ostream>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 14 matching lines @@
 }
 
 PasswordForm::~PasswordForm() {
 }
 
 bool PasswordForm::IsPublicSuffixMatch() const {
   return !original_signon_realm.empty();
 }
 
 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 &&
       username_element == form.username_element &&
       username_marked_by_site == form.username_marked_by_site &&
       username_value == form.username_value &&
       other_possible_usernames == form.other_possible_usernames &&
       password_element == form.password_element &&
       password_value == form.password_value &&
       password_autocomplete_set == form.password_autocomplete_set &&
@@ skipping 14 matching lines @@
       skip_zero_click == form.skip_zero_click;
 }
 
 bool PasswordForm::operator!=(const PasswordForm& form) const {
   return !operator==(form);
 }
 
 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)
             << " username_elem: " << base::UTF16ToUTF8(form.username_element)
             << " username_marked_by_site: " << form.username_marked_by_site
             << " username_value: " << base::UTF16ToUTF8(form.username_value)
             << " password_elem: " << base::UTF16ToUTF8(form.password_element)
             << " password_value: " << base::UTF16ToUTF8(form.password_value)
             << " new_password_element: "
             << base::UTF16ToUTF8(form.new_password_element)
@@ skipping 11 matching lines @@
             << " times_used: " << form.times_used
             << " form_data: " << form.form_data
             << " generation_upload_status: " << form.generation_upload_status
             << " display_name: " << base::UTF16ToUTF8(form.display_name)
             << " avatar_url: " << form.avatar_url
             << " federation_url: " << form.federation_url
             << " skip_next_zero_click: " << form.skip_zero_click;
 }
 
 }  // namespace autofill