Remove ScopedVector from PasswordStoreX

chrome/browser/password_manager/password_store_x_unittest.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 <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 74 matching lines @@
   }
 
   bool DisableAutoSignInForOrigins(
       const base::Callback<bool(const GURL&)>& origin_filter,
       password_manager::PasswordStoreChangeList* changes) override {
     return false;
   }
 
   // Use this as a landmine to check whether results of failed Get*Logins calls
   // get ignored.
-  static ScopedVector<autofill::PasswordForm> CreateTrashForms() {
-    ScopedVector<autofill::PasswordForm> forms;
+  static std::vector<std::unique_ptr<PasswordForm>> CreateTrashForms() {
+    std::vector<std::unique_ptr<PasswordForm>> forms;
     PasswordForm trash;
     trash.username_element = base::ASCIIToUTF16("trash u. element");
     trash.username_value = base::ASCIIToUTF16("trash u. value");
     trash.password_element = base::ASCIIToUTF16("trash p. element");
     trash.password_value = base::ASCIIToUTF16("trash p. value");
     for (size_t i = 0; i < 3; ++i) {
       trash.origin = GURL(base::StringPrintf("http://trash%zu.com", i));
-      forms.push_back(new PasswordForm(trash));
+      forms.push_back(base::MakeUnique<PasswordForm>(trash));
     }
     return forms;
   }
 
   bool GetLogins(const PasswordStore::FormDigest& form,
-                 ScopedVector<autofill::PasswordForm>* forms) override {
+                 std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     *forms = CreateTrashForms();
     return false;
   }
 
   bool GetAutofillableLogins(
-      ScopedVector<autofill::PasswordForm>* forms) override {
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     *forms = CreateTrashForms();
     return false;
   }
 
   bool GetBlacklistLogins(
-      ScopedVector<autofill::PasswordForm>* forms) override {
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     *forms = CreateTrashForms();
     return false;
   }
 
-  bool GetAllLogins(ScopedVector<autofill::PasswordForm>* forms) override {
+  bool GetAllLogins(
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     *forms = CreateTrashForms();
     return false;
   }
 };
 
 class MockBackend : public PasswordStoreX::NativeBackend {
  public:
   bool Init() override { return true; }
 
   PasswordStoreChangeList AddLogin(const PasswordForm& form) override {
@@ skipping 54 matching lines @@
     return true;
   }
 
   bool DisableAutoSignInForOrigins(
       const base::Callback<bool(const GURL&)>& origin_filter,
       password_manager::PasswordStoreChangeList* changes) override {
     return true;
   }
 
   bool GetLogins(const PasswordStore::FormDigest& form,
-                 ScopedVector<autofill::PasswordForm>* forms) override {
+                 std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     for (size_t i = 0; i < all_forms_.size(); ++i)
       if (all_forms_[i].signon_realm == form.signon_realm)
-        forms->push_back(new PasswordForm(all_forms_[i]));
+        forms->push_back(base::MakeUnique<PasswordForm>(all_forms_[i]));
     return true;
   }
 
   bool GetAutofillableLogins(
-      ScopedVector<autofill::PasswordForm>* forms) override {
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     for (size_t i = 0; i < all_forms_.size(); ++i)
       if (!all_forms_[i].blacklisted_by_user)
-        forms->push_back(new PasswordForm(all_forms_[i]));
+        forms->push_back(base::MakeUnique<PasswordForm>(all_forms_[i]));
     return true;
   }
 
   bool GetBlacklistLogins(
-      ScopedVector<autofill::PasswordForm>* forms) override {
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     for (size_t i = 0; i < all_forms_.size(); ++i)
       if (all_forms_[i].blacklisted_by_user)
-        forms->push_back(new PasswordForm(all_forms_[i]));
+        forms->push_back(base::MakeUnique<PasswordForm>(all_forms_[i]));
     return true;
   }
 
-  bool GetAllLogins(ScopedVector<autofill::PasswordForm>* forms) override {
+  bool GetAllLogins(
+      std::vector<std::unique_ptr<PasswordForm>>* forms) override {
     for (size_t i = 0; i < all_forms_.size(); ++i)
-      forms->push_back(new PasswordForm(all_forms_[i]));
+      forms->push_back(base::MakeUnique<PasswordForm>(all_forms_[i]));
     return true;
   }
 
  private:
   void erase(size_t index) {
     if (index < all_forms_.size() - 1)
       all_forms_[index] = all_forms_.back();
     all_forms_.pop_back();
   }
 
@@ skipping 340 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));