CREDENTIAL: Convert federations from URLs to origins throughout.

chrome/browser/password_manager/native_backend_libsecret.cc

 // Copyright (c) 2015 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_libsecret.h"
 
 #include <dlfcn.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <list>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
+#include "url/origin.h"
 
 using autofill::PasswordForm;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 
 namespace {
 const char kEmptyString[] = "";
 const int kMaxPossibleTimeTValue = std::numeric_limits<int>::max();
 }  // namespace
 
@@ skipping 151 matching lines @@
   form->times_used = GetUintFromAttributes(attrs, "times_used");
   form->scheme =
       static_cast<PasswordForm::Scheme>(GetUintFromAttributes(attrs, "scheme"));
   int64_t date_synced = 0;
   base::StringToInt64(GetStringFromAttributes(attrs, "date_synced"),
                       &date_synced);
   form->date_synced = base::Time::FromInternalValue(date_synced);
   form->display_name =
       UTF8ToUTF16(GetStringFromAttributes(attrs, "display_name"));
   form->icon_url = GURL(GetStringFromAttributes(attrs, "avatar_url"));
-  form->federation_url = GURL(GetStringFromAttributes(attrs, "federation_url"));
+  form->federation_origin =
+      url::Origin(GURL(GetStringFromAttributes(attrs, "federation_url")));
   form->skip_zero_click = GetUintFromAttributes(attrs, "skip_zero_click");
   form->generation_upload_status =
       static_cast<PasswordForm::GenerationUploadStatus>(
           GetUintFromAttributes(attrs, "generation_upload_status"));
   base::StringPiece encoded_form_data =
       GetStringFromAttributes(attrs, "form_data");
   if (!encoded_form_data.empty()) {
     bool success = DeserializeFormDataFromBase64String(encoded_form_data,
                                                        &form->form_data);
     password_manager::metrics_util::FormDeserializationStatus status =
@@ skipping 241 matching lines @@
   int64_t date_synced = form.date_synced.ToInternalValue();
   std::string form_data;
   SerializeFormDataToBase64String(form.form_data, &form_data);
   GError* error = nullptr;
   secret_password_store_sync(
       &kLibsecretSchema,
       nullptr,                     // Default collection.
       form.origin.spec().c_str(),  // Display name.
       UTF16ToUTF8(form.password_value).c_str(),
       nullptr,  // no cancellable ojbect
-      &error,
-      "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(),
+      &error, "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(),

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

Please return the nice formatting.

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

Ditto.

       "application", app_string_.c_str(), nullptr);
 
   if (error) {
     LOG(ERROR) << "Libsecret add raw login failed: " << error->message;
     g_error_free(error);
     return false;
   }
   return true;
 }
 
@@ skipping 158 matching lines @@
     UMA_HISTOGRAM_ENUMERATION(
         "PasswordManager.PslDomainMatchTriggering",
         password_manager::ShouldPSLDomainMatchingApply(registered_domain)
             ? psl_domain_match_metric
             : password_manager::PSL_DOMAIN_MATCH_NOT_USED,
         password_manager::PSL_DOMAIN_MATCH_COUNT);
   }
   g_list_free(found);
   return forms;
 }