Introduce extensions::CreateUrlCollectionFromForm

chrome/browser/ui/passwords/password_manager_presenter.cc

 // Copyright 2013 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/password_manager_presenter.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_manager_util_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/password_manager/password_manager_util_mac.h"
 #endif
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/extensions/api/passwords_private/passwords_private_utils.h"
+#endif
+
 using base::StringPiece;
 using password_manager::PasswordStore;
 
 namespace {
 
 const char kSortKeyPartsSeparator = ' ';
 
 // The character that is added to a sort key if there is no federation.
 // Note: to separate the entries w/ federation and the entries w/o federation,
 // this character should be alphabetically smaller than real federations.
@@ skipping 175 matching lines @@
         ProfileSyncServiceFactory::GetForProfile(password_view_->GetProfile());
   }
   if (password_manager::sync_util::IsSyncAccountCredential(
           *password_list_[index], sync_service,
           SigninManagerFactory::GetForProfile(password_view_->GetProfile()))) {
     base::RecordAction(
         base::UserMetricsAction("PasswordManager_SyncCredentialShown"));
   }
 
   // Call back the front end to reveal the password.
-  std::string origin_url = password_manager::GetHumanReadableOrigin(
-      *password_list_[index]);
+  std::string origin_url =
+      extensions::CreateUrlCollectionFromForm(*password_list_[index]).origin;
   password_view_->ShowPassword(
       index,
       origin_url,
       base::UTF16ToUTF8(password_list_[index]->username_value),
       password_list_[index]->password_value);
 #endif
 }
 
 std::vector<std::unique_ptr<autofill::PasswordForm>>
 PasswordManagerPresenter::GetAllPasswords() {
@@ skipping 137 matching lines @@
 
 void PasswordManagerPresenter::PasswordExceptionListPopulater::
     OnGetPasswordStoreResults(
         std::vector<std::unique_ptr<autofill::PasswordForm>> results) {
   page_->password_exception_list_ = std::move(results);
   page_->SortEntriesAndHideDuplicates(&page_->password_exception_list_,
                                       &page_->password_exception_duplicates_,
                                       PasswordEntryType::BLACKLISTED);
   page_->SetPasswordExceptionList();
 }