CREDENTIAL: Convert federations from URLs to origins throughout.

chrome/browser/password_manager/native_backend_kwallet_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_kwallet_x.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 10 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/origin.h"
 
 using autofill::PasswordForm;
 using content::BrowserThread;
 
 namespace {
 
 // In case the fields in the pickle ever change, version them so we can try to
 // read old pickles. (Note: do not eat old pickles past the expiration date.)
 const int kPickleVersion = 7;
 
@@ skipping 36 matching lines @@
   if (!iter->ReadString(&url_string)) {
     if (!warn_only)
       LOG(ERROR) << "Failed to deserialize URL.";
     *url = GURL();
     return false;
   }
   *url = GURL(url_string);
   return true;
 }
 
+// Convenience function to read a url::Origin from a Pickle. Assumes the origin
+// has been written as a UTF-8 string. Returns true on success.
+bool ReadOrigin(base::PickleIterator* iter,
+                bool warn_only,
+                url::Origin* origin) {
+  std::string origin_string;
+  if (!iter->ReadString(&origin_string)) {
+    if (!warn_only)
+      LOG(ERROR) << "Failed to deserialize Origin.";
+    *origin = url::Origin();
+    return false;
+  }
+  *origin = url::Origin(GURL(origin_string));
+  return true;
+}
+
 void LogDeserializationWarning(int version,
                                std::string signon_realm,
                                bool warn_only) {
   if (warn_only) {
     LOG(WARNING) << "Failed to deserialize version " << version
                  << " KWallet entry (realm: " << signon_realm
                  << ") with native architecture size; will try alternate "
                  << "size.";
   } else {
     LOG(ERROR) << "Failed to deserialize version " << version
@@ skipping 95 matching lines @@
       if (!iter.ReadInt64(&date_synced)) {
         LogDeserializationWarning(version, signon_realm, false);
         return false;
       }
       form->date_synced = base::Time::FromInternalValue(date_synced);
     }
 
     if (version > 3) {
       if (!iter.ReadString16(&form->display_name) ||
           !ReadGURL(&iter, warn_only, &form->icon_url) ||
-          !ReadGURL(&iter, warn_only, &form->federation_url) ||
+          !ReadOrigin(&iter, warn_only, &form->federation_origin) ||
           !iter.ReadBool(&form->skip_zero_click)) {
         LogDeserializationWarning(version, signon_realm, false);
         return false;
       }
     }
 
     if (version > 4) {
       form->date_created = base::Time::FromInternalValue(date_created);
     } else {
       form->date_created = base::Time::FromTimeT(date_created);
@@ skipping 38 matching lines @@
     pickle->WriteBool(form->ssl_valid);
     pickle->WriteBool(form->preferred);
     pickle->WriteBool(form->blacklisted_by_user);
     pickle->WriteInt64(form->date_created.ToInternalValue());
     pickle->WriteInt(form->type);
     pickle->WriteInt(form->times_used);
     autofill::SerializeFormData(form->form_data, pickle);
     pickle->WriteInt64(form->date_synced.ToInternalValue());
     pickle->WriteString16(form->display_name);
     pickle->WriteString(form->icon_url.spec());
-    pickle->WriteString(form->federation_url.spec());
+    pickle->WriteString(form->federation_origin.Serialize());
     pickle->WriteBool(form->skip_zero_click);
     pickle->WriteInt(form->generation_upload_status);
   }
 }
 
 // Moves the content of |second| to the end of |first|.
 void AppendSecondToFirst(ScopedVector<autofill::PasswordForm>* first,
                          ScopedVector<autofill::PasswordForm> second) {
   first->reserve(first->size() + second.size());
   first->insert(first->end(), second.begin(), second.end());
@@ skipping 782 matching lines @@
   }
 
   return handle;
 }
 
 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const {
   // Originally, the folder name was always just "Chrome Form Data".
   // Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_);
 }