Simplify GetLoginsRequest, and let PasswordStore::GetLoginsImpl take scoped_ptr<GetLoginsRequest>

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 146 matching lines @@
 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->result()->swap(obtained_forms);
+    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.
-  ForwardLoginsResult(request.Pass());
+  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->result()->swap(obtained_forms);
+    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.
-  ForwardLoginsResult(request.Pass());
+  request->NotifyConsumerWithResults(ScopedVector<autofill::PasswordForm>());
 }
 
 bool PasswordStoreX::FillAutofillableLogins(
     ScopedVector<autofill::PasswordForm>* forms) {
   CheckMigration();
   if (use_native_backend() && backend_->GetAutofillableLogins(forms)) {
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
     if (forms->size() > 0)
       allow_fallback_ = false;
     return true;
@@ skipping 80 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;
 }