Remove invalid "suffix" assumption from CreateSortKey

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 119 matching lines @@
 void PasswordManagerPresenterTest::SortAndCheckPositions(
     const SortEntry test_entries[],
     size_t number_of_entries,
     PasswordEntryType entry_type) {
   std::vector<std::unique_ptr<autofill::PasswordForm>> list;
   size_t expected_number_of_unique_entries = 0;
   for (size_t i = 0; i < number_of_entries; i++) {
     const SortEntry& entry = test_entries[i];
     std::unique_ptr<autofill::PasswordForm> form(new autofill::PasswordForm());
     form->signon_realm = entry.origin;
-    form->origin = GURL(base::ASCIIToUTF16(entry.origin));
+    form->origin = GURL(entry.origin);
     if (entry_type == PasswordEntryType::SAVED) {
       form->username_value = base::ASCIIToUTF16(entry.username);
       form->password_value = base::ASCIIToUTF16(entry.password);
       if (entry.federation != nullptr)
         form->federation_origin = url::Origin(GURL(entry.federation));
     }
     if (entry.affiliated_web_realm)
       form->affiliated_web_realm = entry.affiliated_web_realm;
     list.push_back(std::move(form));
     if (entry.expected_position >= 0)
       expected_number_of_unique_entries++;
   }
 
   DuplicatesMap duplicates;
   mock_controller_->GetPasswordManagerPresenter()->SortEntriesAndHideDuplicates(
       &list, &duplicates, entry_type);
 
   ASSERT_EQ(expected_number_of_unique_entries, list.size());
   ASSERT_EQ(number_of_entries - expected_number_of_unique_entries,
             duplicates.size());
   for (size_t i = 0; i < number_of_entries; i++) {
     const SortEntry& entry = test_entries[i];
     if (entry.expected_position >= 0) {
       SCOPED_TRACE(testing::Message("position in sorted list: ")
                    << entry.expected_position);
-      EXPECT_EQ(GURL(base::ASCIIToUTF16(entry.origin)),
-                list[entry.expected_position]->origin);
+      EXPECT_EQ(GURL(entry.origin), list[entry.expected_position]->origin);
       if (entry_type == PasswordEntryType::SAVED) {
         EXPECT_EQ(base::ASCIIToUTF16(entry.username),
                   list[entry.expected_position]->username_value);
         EXPECT_EQ(base::ASCIIToUTF16(entry.password),
                   list[entry.expected_position]->password_value);
         if (entry.federation != nullptr)
           EXPECT_EQ(url::Origin(GURL(entry.federation)),
                     list[entry.expected_position]->federation_origin);
       }
     }
@@ skipping 83 matching lines @@
       // 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.
   };
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::SAVED);
 }
 
+TEST_F(PasswordManagerPresenterTest, Sorting_Subdomains) {
+  const SortEntry test_cases[] = {
+      {"http://example.com", "u", "p", nullptr, nullptr, 0},
+      {"http://b.example.com", "u", "p", nullptr, nullptr, 6},
+      {"http://a.example.com", "u", "p", nullptr, nullptr, 1},
+      {"http://1.a.example.com", "u", "p", nullptr, nullptr, 2},
+      {"http://2.a.example.com", "u", "p", nullptr, nullptr, 3},
+      {"http://x.2.a.example.com", "u", "p", nullptr, nullptr, 4},
+      {"http://y.2.a.example.com", "u", "p", nullptr, nullptr, 5},
+  };
+  SortAndCheckPositions(test_cases, arraysize(test_cases),
+                        PasswordEntryType::SAVED);
+}
+
 TEST_F(PasswordManagerPresenterTest, Sorting_PasswordExceptions) {
   const SortEntry test_cases[] = {
       {"http://example-b.com", nullptr, nullptr, nullptr, nullptr, 1},
       {"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);
 }
@@ skipping 17 matching lines @@
 TEST_F(PasswordManagerPresenterTest, Sorting_Federations) {
   const SortEntry test_cases[] = {
       {"https://example.com", "user", "secret", nullptr, nullptr, 0},
       {"https://example.com", "user", "secret", nullptr, "https://fed1.com", 1},
       {"https://example.com", "user", "secret", nullptr, "https://fed2.com",
        2}};
   SortAndCheckPositions(test_cases, arraysize(test_cases),
                         PasswordEntryType::SAVED);
 }
 
+TEST_F(PasswordManagerPresenterTest, Sorting_SpecialCharacters) {
+  // URLs with encoded special characters should not cause crash during sorting.
+  LOG(INFO) << GURL("http://abč.com");

[kolos1, 2016/11/15 12:50:53]

Hi Vaclav,

Is it your intention to output these URLs? Or did you forget to remove them?

Regards,
Maxim

[vabr (Chromium), 2016/11/15 17:55:20]

Oops, definitely unintentional. Thanks for spotting it. I filed
https://codereview.chromium.org/2507493002 for removing them.

+  LOG(INFO) << GURL("http://abc.com");
+  LOG(INFO) << GURL("http://ábc.com");
+  LOG(INFO) << GURL("http://uoy.com");
+  LOG(INFO) << GURL("http://üöÿ.com");
+  LOG(INFO) << GURL("http://zrc.com");
+  LOG(INFO) << GURL("http://žřč.com");
+  const SortEntry test_cases[] = {
+      {"https://xn--bea5m6d.com/", "user_a", "pwd", nullptr, nullptr, 4},
+      {"https://uoy.com/", "user_a", "pwd", nullptr, nullptr, 1},
+      {"https://zrc.com/", "user_a", "pwd", nullptr, nullptr, 6},
+      {"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