CREDENTIAL: Convert federations from URLs to origins throughout.

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 <sstream>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 38 matching lines @@
   target->SetDouble("date_created", form.date_created.ToDoubleT());
   target->SetDouble("date_synced", form.date_synced.ToDoubleT());
   target->SetInteger("type", form.type);
   target->SetInteger("times_used", form.times_used);
   std::ostringstream form_data_string_stream;
   form_data_string_stream << form.form_data;
   target->SetString("form_data", form_data_string_stream.str());
   target->SetInteger("generation_upload_status", form.generation_upload_status);
   target->SetString("display_name", form.display_name);
   target->SetString("icon_url", form.icon_url.possibly_invalid_spec());
-  target->SetString("federation_url",
-                    form.federation_url.possibly_invalid_spec());
+  target->SetString("federation_origin", form.federation_origin.Serialize());
   target->SetBoolean("skip_next_zero_click", form.skip_zero_click);
   std::ostringstream layout_string_stream;
   layout_string_stream << form.layout;
   target->SetString("layout", layout_string_stream.str());
   target->SetBoolean("was_parsed_using_autofill_predictions",
                      form.was_parsed_using_autofill_predictions);
 }
 
 }  // namespace
 
@@ skipping 40 matching lines @@
          new_password_element == form.new_password_element &&
          new_password_marked_by_site == form.new_password_marked_by_site &&
          new_password_value == form.new_password_value &&
          ssl_valid == form.ssl_valid && preferred == form.preferred &&
          date_created == form.date_created && date_synced == form.date_synced &&
          blacklisted_by_user == form.blacklisted_by_user && type == form.type &&
          times_used == form.times_used &&
          form_data.SameFormAs(form.form_data) &&
          generation_upload_status == form.generation_upload_status &&
          display_name == form.display_name && icon_url == form.icon_url &&
-         federation_url == form.federation_url &&
+         // We compare the serialization of the origins here, as we want unique
+         // origins to compare as '=='.
+         federation_origin.Serialize() == form.federation_origin.Serialize() &&
          skip_zero_click == form.skip_zero_click && layout == form.layout &&
          was_parsed_using_autofill_predictions ==
              form.was_parsed_using_autofill_predictions &&
          is_public_suffix_match == form.is_public_suffix_match &&
          is_affiliation_based_match == form.is_affiliation_based_match;
 }
 
 bool PasswordForm::operator!=(const PasswordForm& form) const {
   return !operator==(form);
 }
@@ skipping 62 matching lines @@
       form_json, base::JSONWriter::OPTIONS_PRETTY_PRINT, &form_as_string);
   base::TrimWhitespaceASCII(form_as_string, base::TRIM_ALL, &form_as_string);
   return os << "PasswordForm(" << form_as_string << ")";
 }
 
 std::ostream& operator<<(std::ostream& os, PasswordForm* form) {
   return os << "&" << *form;
 }
 
 }  // namespace autofill