CREDENTIAL: Convert federations from URLs to origins throughout.

components/password_manager/core/common/credential_manager_types.cc

Index: components/password_manager/core/common/credential_manager_types.cc
diff --git a/components/password_manager/core/common/credential_manager_types.cc b/components/password_manager/core/common/credential_manager_types.cc
index a9bac499f6313fdafb80315bcdfd6fc7bf11d5c7..d89902134ec9cc40b919d8d89ccd271163166a20 100644
--- a/components/password_manager/core/common/credential_manager_types.cc
+++ b/components/password_manager/core/common/credential_manager_types.cc
@@ -19,14 +19,14 @@ CredentialInfo::CredentialInfo(const autofill::PasswordForm& form,
       name(form.display_name),
       icon(form.icon_url),
       password(form.password_value),
-      federation(form.federation_url) {
+      federation(form.federation_origin) {
   switch (form_type) {
     case CredentialType::CREDENTIAL_TYPE_EMPTY:
       password = base::string16();
-      federation = GURL();
+      federation = url::Origin();
       break;
     case CredentialType::CREDENTIAL_TYPE_PASSWORD:
-      federation = GURL();
+      federation = url::Origin();
       break;
     case CredentialType::CREDENTIAL_TYPE_FEDERATED:
       password = base::string16();
@@ -47,7 +47,7 @@ scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromCredentialInfo(
   form.reset(new autofill::PasswordForm);
   form->icon_url = info.icon;
   form->display_name = info.name;
-  form->federation_url = info.federation;
+  form->federation_origin = info.federation;
   form->origin = origin;
   form->password_value = info.password;
   form->username_value = info.id;
@@ -64,7 +64,7 @@ scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromCredentialInfo(
 bool CredentialInfo::operator==(const CredentialInfo& rhs) const {
   return (type == rhs.type && id == rhs.id && name == rhs.name &&
           icon == rhs.icon && password == rhs.password &&
-          federation == rhs.federation);
+          federation.Serialize() == rhs.federation.Serialize());

[vasilii, 2016/02/23 14:59:20]

Why aren't you happy with operator== ?

[Mike West, 2016/02/25 09:56:16]

Same as above.

 }
 
 }  // namespace password_manager