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

chrome/browser/password_manager/password_store_mac.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_mac.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
 
 #include <CoreServices/CoreServices.h>
 #include <set>
 #include <string>
@@ skipping 1068 matching lines @@
   if (!database_forms.empty()) {
     RemoveDatabaseForms(&database_forms);
     NotifyLoginsChanged(FormsToRemoveChangeList(database_forms.get()));
   }
 
   return matched_forms.Pass();
 }
 
 void PasswordStoreMac::GetBlacklistLoginsImpl(
     scoped_ptr<PasswordStore::GetLoginsRequest> request) {
-  DCHECK(request->result()->empty());
-  FillBlacklistLogins(request->result());
-  ForwardLoginsResult(request.Pass());
+  ScopedVector<autofill::PasswordForm> obtained_forms;
+  FillBlacklistLogins(&obtained_forms);
+  request->NotifyConsumerWithResults(obtained_forms.Pass());
 }
 
 void PasswordStoreMac::GetAutofillableLoginsImpl(
     scoped_ptr<PasswordStore::GetLoginsRequest> request) {
-  DCHECK(request->result()->empty());
-  FillAutofillableLogins(request->result());
-  ForwardLoginsResult(request.Pass());
+  ScopedVector<autofill::PasswordForm> obtained_forms;
+  FillAutofillableLogins(&obtained_forms);
+  request->NotifyConsumerWithResults(obtained_forms.Pass());
 }
 
 bool PasswordStoreMac::FillAutofillableLogins(
     ScopedVector<autofill::PasswordForm>* forms) {
   DCHECK(thread_->message_loop() == base::MessageLoop::current());
 
   ScopedVector<PasswordForm> database_forms;
   if (!login_metadata_db_ ||
       !login_metadata_db_->GetAutofillableLogins(&database_forms))
     return false;
@@ skipping 77 matching lines @@
   ScopedVector<PasswordForm> forms_with_keychain_entry;
   internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms,
                                                   &forms_with_keychain_entry);
 
   // Clean up any orphaned database entries.
   RemoveDatabaseForms(&database_forms);
 
   // Move the orphaned DB forms to the output parameter.
   AppendSecondToFirst(orphaned_forms, &database_forms);
 }