Remove ScopedVector from PasswordStoreX

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 <utility>
 #include <vector>
@@ skipping 26 matching lines @@
   return (!changes->empty() &&
           changes->back().type() == PasswordStoreChange::ADD);
 }
 
 bool RemoveLoginsByURLAndTimeFromBackend(
     PasswordStoreX::NativeBackend* backend,
     const base::Callback<bool(const GURL&)>& url_filter,
     base::Time delete_begin,
     base::Time delete_end,
     PasswordStoreChangeList* changes) {
-  ScopedVector<autofill::PasswordForm> forms;
+  std::vector<std::unique_ptr<PasswordForm>> forms;
   if (!backend->GetAllLogins(&forms))
     return false;
 
-  for (const autofill::PasswordForm* form : forms) {
+  for (const auto& form : forms) {
     if (url_filter.Run(form->origin) && form->date_created >= delete_begin &&
         (delete_end.is_null() || form->date_created < delete_end) &&
         !backend->RemoveLogin(*form, changes))
       return false;
   }
 
   return true;
 }
 
 }  // namespace
@@ skipping 123 matching lines @@
                const std::unique_ptr<PasswordForm>& b) {
               return a->origin < b->origin;
             });
 }
 
 }  // anonymous namespace
 
 std::vector<std::unique_ptr<PasswordForm>> PasswordStoreX::FillMatchingLogins(
     const FormDigest& form) {
   CheckMigration();
-  ScopedVector<autofill::PasswordForm> matched_forms_scopedvector;
-  if (use_native_backend() &&
-      backend_->GetLogins(form, &matched_forms_scopedvector)) {
-    std::vector<std::unique_ptr<PasswordForm>> matched_forms =
-        password_manager_util::ConvertScopedVector(
-            std::move(matched_forms_scopedvector));
+  std::vector<std::unique_ptr<PasswordForm>> matched_forms;
+  if (use_native_backend() && backend_->GetLogins(form, &matched_forms)) {
     SortLoginsByOrigin(&matched_forms);
     // 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.empty())
       allow_fallback_ = false;
     return matched_forms;
   }
   if (allow_default_store())
     return PasswordStoreDefault::FillMatchingLogins(form);
   return std::vector<std::unique_ptr<PasswordForm>>();
 }
 
 bool PasswordStoreX::FillAutofillableLogins(
     std::vector<std::unique_ptr<PasswordForm>>* forms) {
   CheckMigration();
-  ScopedVector<autofill::PasswordForm> forms_scopedvector;
-  if (use_native_backend() &&
-      backend_->GetAutofillableLogins(&forms_scopedvector)) {
-    *forms = password_manager_util::ConvertScopedVector(
-        std::move(forms_scopedvector));
+  if (use_native_backend() && backend_->GetAutofillableLogins(forms)) {
     SortLoginsByOrigin(forms);
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
     if (!forms->empty())
       allow_fallback_ = false;
     return true;
   }
   if (allow_default_store())
     return PasswordStoreDefault::FillAutofillableLogins(forms);
   return false;
 }
 
 bool PasswordStoreX::FillBlacklistLogins(
     std::vector<std::unique_ptr<PasswordForm>>* forms) {
   CheckMigration();
-  ScopedVector<autofill::PasswordForm> forms_scopedvector;
-  if (use_native_backend() &&
-      backend_->GetBlacklistLogins(&forms_scopedvector)) {
-    *forms = password_manager_util::ConvertScopedVector(
-        std::move(forms_scopedvector));
+  if (use_native_backend() && backend_->GetBlacklistLogins(forms)) {
     // See GetLoginsImpl() for why we disallow fallback conditionally here.
     SortLoginsByOrigin(forms);
     if (!forms->empty())
       allow_fallback_ = false;
     return true;
   }
   if (allow_default_store())
     return PasswordStoreDefault::FillBlacklistLogins(forms);
   return false;
 }
@@ skipping 66 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;
 }