CREDENTIAL: Convert federations from URLs to origins throughout.

chrome/browser/password_manager/native_backend_gnome_x.cc

 // Copyright (c) 2012 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 "chrome/browser/password_manager/native_backend_gnome_x.h"
 
 #include <dlfcn.h>
 #include <gnome-keyring.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 139 matching lines @@
                            : base::Time::FromInternalValue(date_created);
   form->blacklisted_by_user = uint_attr_map["blacklisted_by_user"];
   form->type = static_cast<PasswordForm::Type>(uint_attr_map["type"]);
   form->times_used = uint_attr_map["times_used"];
   form->scheme = static_cast<PasswordForm::Scheme>(uint_attr_map["scheme"]);
   int64_t date_synced = 0;
   base::StringToInt64(string_attr_map["date_synced"], &date_synced);
   form->date_synced = base::Time::FromInternalValue(date_synced);
   form->display_name = UTF8ToUTF16(string_attr_map["display_name"]);
   form->icon_url = GURL(string_attr_map["avatar_url"]);
-  form->federation_url = GURL(string_attr_map["federation_url"]);
+  form->federation_origin =
+      url::Origin(GURL(string_attr_map["federation_url"]));
   form->skip_zero_click = uint_attr_map["skip_zero_click"];
   form->generation_upload_status =
       static_cast<PasswordForm::GenerationUploadStatus>(
           uint_attr_map["generation_upload_status"]);
   if (!string_attr_map["form_data"].empty()) {
     bool success = DeserializeFormDataFromBase64String(
         string_attr_map["form_data"], &form->form_data);
     FormDeserializationStatus status = success ? GNOME_SUCCESS : GNOME_FAILURE;
     LogFormDataDeserializationStatus(status);
   }
@@ skipping 168 matching lines @@
   int64_t date_created = form.date_created.ToInternalValue();
   // If we are asked to save a password with 0 date, use the current time.
   // We don't want to actually save passwords as though on January 1, 1601.
   if (!date_created)
     date_created = base::Time::Now().ToInternalValue();
   int64_t date_synced = form.date_synced.ToInternalValue();
   std::string form_data;
   SerializeFormDataToBase64String(form.form_data, &form_data);
   gnome_keyring_store_password(
       &kGnomeSchema,
-      nullptr,  // Default keyring.
+      nullptr,                     // Default keyring.
       form.origin.spec().c_str(),  // Display name.
-      UTF16ToUTF8(form.password_value).c_str(),
-      OnOperationDone,
-      this,  // data
+      UTF16ToUTF8(form.password_value).c_str(), OnOperationDone,
+      this,     // data
       nullptr,  // destroy_data
-      "origin_url", form.origin.spec().c_str(),
-      "action_url", form.action.spec().c_str(),
-      "username_element", UTF16ToUTF8(form.username_element).c_str(),
-      "username_value", UTF16ToUTF8(form.username_value).c_str(),
-      "password_element", UTF16ToUTF8(form.password_element).c_str(),
-      "submit_element", UTF16ToUTF8(form.submit_element).c_str(),
-      "signon_realm", form.signon_realm.c_str(),
-      "ssl_valid", form.ssl_valid,
-      "preferred", form.preferred,
-      "date_created", base::Int64ToString(date_created).c_str(),
-      "blacklisted_by_user", form.blacklisted_by_user,
-      "type", form.type,
-      "times_used", form.times_used,
-      "scheme", form.scheme,
-      "date_synced", base::Int64ToString(date_synced).c_str(),
-      "display_name", UTF16ToUTF8(form.display_name).c_str(),
-      "avatar_url", form.icon_url.spec().c_str(),
-      "federation_url", form.federation_url.spec().c_str(),
-      "skip_zero_click", form.skip_zero_click,
-      "generation_upload_status", form.generation_upload_status,
-      "form_data", form_data.c_str(),
-      "application", app_string,
-      nullptr);
+      "origin_url", form.origin.spec().c_str(), "action_url",
+      form.action.spec().c_str(), "username_element",
+      UTF16ToUTF8(form.username_element).c_str(), "username_value",
+      UTF16ToUTF8(form.username_value).c_str(), "password_element",
+      UTF16ToUTF8(form.password_element).c_str(), "submit_element",
+      UTF16ToUTF8(form.submit_element).c_str(), "signon_realm",
+      form.signon_realm.c_str(), "ssl_valid", form.ssl_valid, "preferred",
+      form.preferred, "date_created", base::Int64ToString(date_created).c_str(),
+      "blacklisted_by_user", form.blacklisted_by_user, "type", form.type,
+      "times_used", form.times_used, "scheme", form.scheme, "date_synced",
+      base::Int64ToString(date_synced).c_str(), "display_name",
+      UTF16ToUTF8(form.display_name).c_str(), "avatar_url",
+      form.icon_url.spec().c_str(), "federation_url",
+      form.federation_origin.Serialize().c_str(), "skip_zero_click",
+      form.skip_zero_click, "generation_upload_status",
+      form.generation_upload_status, "form_data", form_data.c_str(),
+      "application", app_string, nullptr);

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

Nice formatting please.

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

If you liked it, you should have put a clang-format off on it. :)

[vasilii, 2016/02/25 12:38:01]

I didn't know about that directive.

 }
 
 void GKRMethod::LoginSearch(const PasswordForm& form,
                                const char* app_string) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   lookup_form_.reset(nullptr);
   // Search GNOME Keyring for matching passwords to update.
   ScopedAttributeList attrs(gnome_keyring_attribute_list_new());
   AppendString(&attrs, "origin_url", form.origin.spec());
   AppendString(&attrs, "username_element", UTF16ToUTF8(form.username_element));
@@ skipping 414 matching lines @@
   ScopedVector<PasswordForm> forms;
   if (!GetLoginsBetween(get_begin, get_end, date_to_compare, &forms))
     return false;
 
   for (size_t i = 0; i < forms.size(); ++i) {
     if (!RemoveLogin(*forms[i], changes))
       return false;
   }
   return true;
 }