[Password Manager] Add the scheme to sort keys for chrome://settings/passwords

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 35 matching lines @@
 #include "chrome/browser/password_manager/password_manager_util_mac.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.
+const char kSortKeyNoFederationSymbol = '-';
+
 // Helper function that returns the type of the entry (non-Android credentials,
 // Android w/ affiliated web realm (i.e. clickable) or w/o web realm).
 std::string GetEntryTypeCode(bool is_android_uri, bool is_clickable) {
   if (!is_android_uri)
     return "0";
   if (is_clickable)
     return "1";
   return "2";
 }
 
 // Creates key for sorting password or password exception entries. The key is
 // eTLD+1 followed by the reversed list of domains (e.g.
-// secure.accounts.example.com => example.com.com.example.accounts.secure). If
-// |entry_type == SAVED|, username, password and federation are appended to the
-// key. The entry type code (non-Android, Android w/ or w/o affiliated web
-// realm) is also appended to the key.
+// secure.accounts.example.com => example.com.com.example.accounts.secure) and
+// the scheme. If |entry_type == SAVED|, username, password and federation are
+// appended to the key. The entry type code (non-Android, Android w/ or w/o
+// affiliated web realm) is also appended to the key.
 std::string CreateSortKey(const autofill::PasswordForm& form,
                           PasswordEntryType entry_type) {
   bool is_android_uri = false;
   bool is_clickable = false;
   GURL link_url;
   std::string origin = password_manager::GetShownOriginAndLinkUrl(
       form, &is_android_uri, &link_url, &is_clickable);
 
   if (!is_clickable)  // e.g. android://com.example.r => r.example.com.
     origin = password_manager::StripAndroidAndReverse(origin);
 
   std::string site_name =
       net::registry_controlled_domains::GetDomainAndRegistry(
           origin, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
   if (site_name.empty())  // e.g. localhost.
     site_name = origin;
   std::string key = site_name + password_manager::SplitByDotAndReverse(origin);
 
   if (entry_type == PasswordEntryType::SAVED) {
-    key = key + kSortKeyPartsSeparator +
-          base::UTF16ToUTF8(form.username_value) + kSortKeyPartsSeparator +
-          base::UTF16ToUTF8(form.password_value);
+    key += kSortKeyPartsSeparator + base::UTF16ToUTF8(form.username_value) +
+           kSortKeyPartsSeparator + base::UTF16ToUTF8(form.password_value);
+
+    key += kSortKeyPartsSeparator;
     if (!form.federation_origin.unique())
-      key = key + kSortKeyPartsSeparator + form.federation_origin.host();
+      key += form.federation_origin.host();
+    else
+      key += kSortKeyNoFederationSymbol;
   }
 
+  // To separate HTTP/HTTPS credentials, add the scheme to the key.
+  key += kSortKeyPartsSeparator + link_url.scheme();
+
   // Since Android and non-Android entries shouldn't be merged into one entry,
   // add the entry type code to the sort key.
   key +=
       kSortKeyPartsSeparator + GetEntryTypeCode(is_android_uri, is_clickable);
   return key;
 }
 
 // Finds duplicates of |form| in |duplicates|, removes them from |store| and
 // from |duplicates|.
 void RemoveDuplicates(const autofill::PasswordForm& form,
@@ skipping 274 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();
 }