Linux: sort the logins by origin when using a native password store, like the built-in store does.

chrome/browser/password_manager/password_store_x.cc

Index: chrome/browser/password_manager/password_store_x.cc
===================================================================
--- chrome/browser/password_manager/password_store_x.cc	(revision 84505)
+++ chrome/browser/password_manager/password_store_x.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/password_manager/password_store_x.h"
 
+#include <algorithm>
 #include <map>
 #include <vector>
 
@@ -98,10 +99,24 @@
   STLDeleteElements(&forms);
 }
 
+namespace {
+struct LoginLessThan {
+  bool operator()(const PasswordForm* a, const PasswordForm* b) {
+    return a->origin < b->origin;
+  }
+};
+}  // anonymous namespace
+
+void PasswordStoreX::SortLoginsByOrigin(NativeBackend::PasswordFormList* list) {
+  // In login_database.cc, the query has ORDER BY origin_url. Simulate that.
+  std::sort(list->begin(), list->end(), LoginLessThan());
+}
+
 void PasswordStoreX::GetLoginsImpl(GetLoginsRequest* request,
                                    const PasswordForm& form) {
   CheckMigration();
   if (use_native_backend() && backend_->GetLogins(form, &request->value)) {
+    SortLoginsByOrigin(&request->value);
     ForwardLoginsResult(request);
     allow_fallback_ = false;
   } else if (allow_default_store()) {
@@ -116,6 +131,7 @@
   CheckMigration();
   if (use_native_backend() &&
       backend_->GetAutofillableLogins(&request->value)) {
+    SortLoginsByOrigin(&request->value);
     ForwardLoginsResult(request);
     allow_fallback_ = false;
   } else if (allow_default_store()) {
@@ -130,6 +146,7 @@
   CheckMigration();
   if (use_native_backend() &&
       backend_->GetBlacklistLogins(&request->value)) {
+    SortLoginsByOrigin(&request->value);
     ForwardLoginsResult(request);
     allow_fallback_ = false;
   } else if (allow_default_store()) {