GetLoginsRequest: Use ScopedVector to express ownership of forms

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 139 matching lines @@
       allow_fallback_ = false;
   } else if (allow_default_store()) {
     DCHECK(matched_forms.empty());
     PasswordStoreDefault::GetLoginsImpl(form, prompt_policy, callback_runner);
     return;
   }
   // The consumer will be left hanging unless we reply.
   callback_runner.Run(matched_forms.Pass());
 }
 
-void PasswordStoreX::GetAutofillableLoginsImpl(GetLoginsRequest* request) {
+void PasswordStoreX::GetAutofillableLoginsImpl(
+    scoped_ptr<PasswordStore::GetLoginsRequest> request) {
   CheckMigration();
   ScopedVector<autofill::PasswordForm> obtained_forms;
   if (use_native_backend() &&
       backend_->GetAutofillableLogins(&obtained_forms)) {
     request->result()->swap(obtained_forms.get());

[vasilii, 2015/02/03 19:22:16]

It's better to do whatever we want with |obtained_forms| and swap in the last
line.

[vabr (Chromium), 2015/02/04 16:13:44]

I share that sentiment. :)
Done.

-    SortLoginsByOrigin(request->result());
+    SortLoginsByOrigin(&request->result()->get());
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
     if (request->result()->size() > 0)
       allow_fallback_ = false;
   } else if (allow_default_store()) {
-    PasswordStoreDefault::GetAutofillableLoginsImpl(request);
+    PasswordStoreDefault::GetAutofillableLoginsImpl(request.Pass());
     return;
   }
   // The consumer will be left hanging unless we reply.
-  ForwardLoginsResult(request);
+  ForwardLoginsResult(request.Pass());
 }
 
-void PasswordStoreX::GetBlacklistLoginsImpl(GetLoginsRequest* request) {
+void PasswordStoreX::GetBlacklistLoginsImpl(
+    scoped_ptr<PasswordStore::GetLoginsRequest> request) {
   CheckMigration();
   ScopedVector<autofill::PasswordForm> obtained_forms;
   if (use_native_backend() && backend_->GetBlacklistLogins(&obtained_forms)) {
     request->result()->swap(obtained_forms.get());
-    SortLoginsByOrigin(request->result());
+    SortLoginsByOrigin(&request->result()->get());

[vasilii, 2015/02/03 19:22:16]

See above.

[vabr (Chromium), 2015/02/04 16:13:44]

Done.

     // See GetLoginsImpl() for why we disallow fallback conditionally here.
     if (request->result()->size() > 0)
       allow_fallback_ = false;
   } else if (allow_default_store()) {
-    PasswordStoreDefault::GetBlacklistLoginsImpl(request);
+    PasswordStoreDefault::GetBlacklistLoginsImpl(request.Pass());
     return;
   }
   // The consumer will be left hanging unless we reply.
-  ForwardLoginsResult(request);
+  ForwardLoginsResult(request.Pass());
 }
 
 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;
 }