[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.
+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";
 }
 
@@ skipping 18 matching lines @@
       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);
     if (!form.federation_origin.unique())

[vasilii, 2016/11/15 13:18:11]

Why don't you just use Origin::Serialize()?

[kolos1, 2016/11/15 13:57:38]

Serialize() returns "null" if there is no federation. "null" will be compared
with other federations. 

But I would like to separate the entries with federations and the entries w/o
federations. The special symbol like "-" does that. The entries w/o federations
appear earlier.

[vasilii, 2016/11/15 14:14:54]

If it's important then it should go to a comment on kSortKeyNoFederationSymbol.

[kolos1, 2016/11/15 14:42:51]

Done.

       key = key + kSortKeyPartsSeparator + form.federation_origin.host();
+    else
+      key = key + kSortKeyPartsSeparator + kSortKeyNoFederationSymbol;

[vasilii, 2016/11/15 13:18:10]

key+= is faster and easier to read. 

[kolos1, 2016/11/15 13:57:38]

In this particular case, we cannot use +=, because the compiler will calculate
the sum of two characters and add it to |key|. But we want to add the
concatenation of these characters. 

[vasilii, 2016/11/15 14:14:55]

key += kSortKeyPartsSeparator;
if ()
  key += form.federation_origin.host();
else 
  key += kSortKeyNoFederationSymbol;

[kolos1, 2016/11/15 14:42:51]

Done.

   }
 
+  // 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();
 }