Delete PasswordStoreX::Get*LoginsImpl

chrome/browser/password_manager/password_store_x.cc

 // Copyright (c) 2012 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>
 
@@ skipping 104 matching lines @@
     LogStatsForBulkDeletionDuringRollback(changes.size());
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     changes = PasswordStoreDefault::RemoveLoginsSyncedBetweenImpl(delete_begin,
                                                                   delete_end);
   }
   return changes;
 }
 
 namespace {
+
 struct LoginLessThan {
   bool operator()(const PasswordForm* a, const PasswordForm* b) {
     return a->origin < b->origin;
   }
 };
-}  // anonymous namespace
 
-void PasswordStoreX::SortLoginsByOrigin(
-    std::vector<autofill::PasswordForm*>* list) {
-  // In login_database.cc, the query has ORDER BY origin_url. Simulate that.
+// Sorts |list| by origin, like the ORDER BY clause in login_database.cc.
+void SortLoginsByOrigin(std::vector<autofill::PasswordForm*>* list) {
   std::sort(list->begin(), list->end(), LoginLessThan());
 }
 
+}  // anonymous namespace
+
 ScopedVector<autofill::PasswordForm> PasswordStoreX::FillMatchingLogins(
     const autofill::PasswordForm& form,
     AuthorizationPromptPolicy prompt_policy) {
   CheckMigration();
   ScopedVector<autofill::PasswordForm> matched_forms;
   if (use_native_backend() && backend_->GetLogins(form, &matched_forms)) {
     SortLoginsByOrigin(&matched_forms.get());
     // The native backend may succeed and return no data even while locked, if
     // the query did not match anything stored. So we continue to allow fallback
     // until we perform a write operation, or until a read returns actual data.
     if (matched_forms.size() > 0)
       allow_fallback_ = false;
   } else if (allow_default_store()) {
     DCHECK(matched_forms.empty());
     return PasswordStoreDefault::FillMatchingLogins(form, prompt_policy);
   }
   return matched_forms.Pass();
 }
 
-void PasswordStoreX::GetAutofillableLoginsImpl(
-    scoped_ptr<PasswordStore::GetLoginsRequest> request) {
-  CheckMigration();
-  ScopedVector<autofill::PasswordForm> obtained_forms;
-  if (use_native_backend() &&
-      backend_->GetAutofillableLogins(&obtained_forms)) {
-    SortLoginsByOrigin(&obtained_forms.get());
-    // See GetLoginsImpl() for why we disallow fallback conditionally here.
-    if (!obtained_forms.empty())
-      allow_fallback_ = false;
-    request->NotifyConsumerWithResults(obtained_forms.Pass());
-    return;
-  } else if (allow_default_store()) {
-    PasswordStoreDefault::GetAutofillableLoginsImpl(request.Pass());
-    return;
-  }
-  // The consumer will be left hanging unless we reply.
-  request->NotifyConsumerWithResults(ScopedVector<autofill::PasswordForm>());
-}
-
-void PasswordStoreX::GetBlacklistLoginsImpl(
-    scoped_ptr<PasswordStore::GetLoginsRequest> request) {
-  CheckMigration();
-  ScopedVector<autofill::PasswordForm> obtained_forms;
-  if (use_native_backend() && backend_->GetBlacklistLogins(&obtained_forms)) {
-    SortLoginsByOrigin(&obtained_forms.get());
-    // See GetLoginsImpl() for why we disallow fallback conditionally here.
-    if (!obtained_forms.empty())
-      allow_fallback_ = false;
-    request->NotifyConsumerWithResults(obtained_forms.Pass());
-    return;
-  } else if (allow_default_store()) {
-    PasswordStoreDefault::GetBlacklistLoginsImpl(request.Pass());
-    return;
-  }
-  // The consumer will be left hanging unless we reply.
-  request->NotifyConsumerWithResults(ScopedVector<autofill::PasswordForm>());
-}
-
 bool PasswordStoreX::FillAutofillableLogins(
     ScopedVector<autofill::PasswordForm>* forms) {
   CheckMigration();
   if (use_native_backend() && backend_->GetAutofillableLogins(forms)) {
+    SortLoginsByOrigin(&forms->get());
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
-    if (forms->size() > 0)
+    if (!forms->empty())
       allow_fallback_ = false;
     return true;
   }
   if (allow_default_store())
     return PasswordStoreDefault::FillAutofillableLogins(forms);
   return false;
 }
 
 bool PasswordStoreX::FillBlacklistLogins(
     ScopedVector<autofill::PasswordForm>* forms) {
   CheckMigration();
   if (use_native_backend() && backend_->GetBlacklistLogins(forms)) {
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
-    if (forms->size() > 0)
+    SortLoginsByOrigin(&forms->get());
+    if (!forms->empty())
       allow_fallback_ = false;
     return true;
   }
   if (allow_default_store())
     return PasswordStoreDefault::FillBlacklistLogins(forms);
   return false;
 }
 
 void PasswordStoreX::CheckMigration() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
@@ skipping 58 matching lines @@
       // Finally, delete the database file itself. We remove the passwords from
       // 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;
   return result;
 }