[Password Manager] Add federations to sort key on password page

chrome/browser/ui/passwords/password_manager_presenter.h

Index: chrome/browser/ui/passwords/password_manager_presenter.h
diff --git a/chrome/browser/ui/passwords/password_manager_presenter.h b/chrome/browser/ui/passwords/password_manager_presenter.h
index fd2ac725ba58a6e23974271cb3afc7f6f0816660..bcb174109b5ed745d6aa60713c066572ece5c671 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter.h
+++ b/chrome/browser/ui/passwords/password_manager_presenter.h
@@ -27,6 +27,8 @@ struct PasswordForm;
 using DuplicatesMap =
     std::multimap<std::string, std::unique_ptr<autofill::PasswordForm>>;
 
+enum PasswordEntryType { SAVED, BLACKLISTED };

[vabr (Chromium), 2016/04/28 14:33:11]

Please make this an "enum class", not just enum. That will disallow implicit
conversions to int and also enclose the value names in the PasswordEntryType
namespace.

[kolos1, 2016/04/28 14:37:43]

Done.

+
 class PasswordUIView;
 
 class Profile;
@@ -83,14 +85,14 @@ class PasswordManagerPresenter
 
   // Sort entries of |list| based on sort key. The key is the concatenation of
   // origin, entry type (non-Android credential, Android w/ affiliated web realm
-  // or Android w/o affiliated web realm). If |username_and_password_in_key|,
-  // username and password are also included in sort key. If there are several
-  // forms with the same key, all such forms but the first one are
+  // or Android w/o affiliated web realm). If |entry_type == SAVED|,
+  // username, password and federation are also included in sort key. If there
+  // are several forms with the same key, all such forms but the first one are
   // stored in |duplicates| instead of |list|.
   void SortEntriesAndHideDuplicates(
       std::vector<std::unique_ptr<autofill::PasswordForm>>* list,
       DuplicatesMap* duplicates,
-      bool username_and_password_in_key);
+      PasswordEntryType entry_type);
 
   // Returns the password store associated with the currently active profile.
   password_manager::PasswordStore* GetPasswordStore();