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

chrome/browser/ui/passwords/password_manager_presenter_unittest.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 <stddef.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 234 matching lines @@
 
 TEST_F(PasswordManagerPresenterTest, Sorting_DifferentPasswords) {
   const SortEntry test_cases[] = {
       {"http://example.com", "user_a", "1", nullptr, nullptr, 0},
       {"http://example.com", "user_a", "2", nullptr, nullptr, 1},
       {"http://example.com", "user_a", "3", nullptr, nullptr, 2}};
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::SAVED);
 }
 
+TEST_F(PasswordManagerPresenterTest, Sorting_DifferentSchemes) {
+  const SortEntry test_cases[] = {
+      {"https://example.com", "user", "1", nullptr, nullptr, 1},
+      {"https://example.com", "user", "1", nullptr, nullptr, -1},  // Hide it.
+      {"http://example.com", "user", "1", nullptr, nullptr, 0}};
+  SortAndCheckPositions(test_cases, arraysize(test_cases),
+                        PasswordEntryType::SAVED);
+}
+
 TEST_F(PasswordManagerPresenterTest, Sorting_HideDuplicates) {
   const SortEntry test_cases[] = {
       {"http://example.com", "user_a", "pwd", nullptr, nullptr, 0},
       // Different username.
       {"http://example.com", "user_b", "pwd", nullptr, nullptr, 2},
       // Different password.
       {"http://example.com", "user_a", "secret", nullptr, nullptr, 1},
       // Different origin.
       {"http://sub1.example.com", "user_a", "pwd", nullptr, nullptr, 3},
       {"http://example.com", "user_a", "pwd", nullptr, nullptr, -1}  // Hide it.
@@ skipping 22 matching lines @@
       {"http://example-a.com", nullptr, nullptr, nullptr, nullptr, 0},
       {"http://example-a.com", nullptr, nullptr, nullptr, nullptr,
        -1},  // Hide it.
       {"http://example-c.com", nullptr, nullptr, nullptr, nullptr, 2}};
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::BLACKLISTED);
 }
 
 TEST_F(PasswordManagerPresenterTest, Sorting_AndroidCredentials) {
   const SortEntry test_cases[] = {
-      {"https://alpha.com", "user", "secret", nullptr, nullptr, 0},
+      {"https://alpha.com", "user", "secret", nullptr, nullptr, 1},
       {"android://hash@com.alpha", "user", "secret", "https://alpha.com",
-       nullptr, 1},
+       nullptr, 0},
       {"android://hash@com.alpha", "user", "secret", "https://alpha.com",
        nullptr, -1},
       {"android://hash@com.alpha", "user", "secret", nullptr, nullptr, 2},
       {"android://hash@com.betta.android", "user", "secret",
        "https://betta.com", nullptr, 3},
       {"android://hash@com.betta.android", "user", "secret", nullptr, nullptr,
        4}};
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::SAVED);
 }
@@ skipping 24 matching lines @@
       {"https://abc.com/", "user_a", "pwd", nullptr, nullptr, 0},
       {"https://xn--ab-fma.com/", "user_a", "pwd", nullptr, nullptr, 2},
       {"https://xn--bc-lia.com/", "user_a", "pwd", nullptr, nullptr, 3},
       {"https://xn--ndalk.com/", "user_a", "pwd", nullptr, nullptr, 5},
   };
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::SAVED);
 }
 
 }  // namespace