CREDENTIAL: Convert federations from URLs to origins throughout.

chrome/browser/ui/passwords/manage_passwords_view_utils.cc

 // Copyright 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/ui/passwords/manage_passwords_view_utils.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/password_manager/core/browser/affiliation_utils.h"
 #include "components/url_formatter/elide_url.h"
 #include "grit/components_strings.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/range/range.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace {
 
 // Checks whether two URLs are from the same domain or host.
 bool SameDomainOrHost(const GURL& gurl1, const GURL& gurl2) {
   return net::registry_controlled_domains::SameDomainOrHost(
       gurl1, gurl2,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
@@ skipping 13 matching lines @@
       skia_image,
       skia::ImageOperations::RESIZE_BEST,
       gfx::Size(kAvatarImageSize, kAvatarImageSize));
 }
 
 std::pair<base::string16, base::string16> GetCredentialLabelsForAccountChooser(
     const autofill::PasswordForm& form) {
   const base::string16& upper_string =
       form.display_name.empty() ? form.username_value : form.display_name;
   base::string16 lower_string;
-  if (form.federation_url.is_empty()) {
+  if (form.federation_origin.unique()) {
     if (!form.display_name.empty())
       lower_string = form.username_value;
   } else {
     lower_string = l10n_util::GetStringFUTF16(
         IDS_PASSWORDS_VIA_FEDERATION,
-        base::UTF8ToUTF16(form.federation_url.host()));
+        base::UTF8ToUTF16(form.federation_origin.host()));
   }
   return std::make_pair(upper_string, lower_string);
 }
 
 void GetSavePasswordDialogTitleTextAndLinkRange(
     const GURL& user_visible_url,
     const GURL& form_origin_url,
     bool is_smartlock_branding_enabled,
     PasswordTittleType dialog_type,
     base::string16* title,
@@ skipping 93 matching lines @@
              : form.username_value;
 }
 
 bool IsSyncingSettings(Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return (sync_service && sync_service->IsFirstSetupComplete() &&
           sync_service->IsSyncActive() &&
           sync_service->GetActiveDataTypes().Has(syncer::PREFERENCES));
 }