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

 // Copyright (c) 2011 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/password_manager/password_store_x.h"
 
+#include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 
 using std::vector;
@@ skipping 74 matching lines @@
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(delete_begin,
                                                          delete_end);
   }
   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()) {
     PasswordStoreDefault::GetLoginsImpl(request, form);
   } else {
     // The consumer will be left hanging unless we reply.
     ForwardLoginsResult(request);
   }
 }
 
 void PasswordStoreX::GetAutofillableLoginsImpl(GetLoginsRequest* request) {
   CheckMigration();
   if (use_native_backend() &&
       backend_->GetAutofillableLogins(&request->value)) {
+    SortLoginsByOrigin(&request->value);
     ForwardLoginsResult(request);
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::GetAutofillableLoginsImpl(request);
   } else {
     // The consumer will be left hanging unless we reply.
     ForwardLoginsResult(request);
   }
 }
 
 void PasswordStoreX::GetBlacklistLoginsImpl(GetLoginsRequest* request) {
   CheckMigration();
   if (use_native_backend() &&
       backend_->GetBlacklistLogins(&request->value)) {
+    SortLoginsByOrigin(&request->value);
     ForwardLoginsResult(request);
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::GetBlacklistLoginsImpl(request);
   } else {
     // The consumer will be left hanging unless we reply.
     ForwardLoginsResult(request);
   }
 }
 
@@ skipping 98 matching lines @@
       // it before deleting the file just in case there is some problem deleting
       // the file (e.g. directory is not writable, but file is), which would
       // otherwise cause passwords to re-migrate next (or maybe every) time.
       DeleteAndRecreateDatabaseFile();
     }
   }
   ssize_t result = ok ? forms.size() : -1;
   STLDeleteElements(&forms);
   return result;
 }