PasswordStore: Use ScopedVector to express ownership of forms

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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
@@ skipping 15 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
 using password_manager::ContainsAllPasswordForms;
 using password_manager::PasswordStoreChange;
 using password_manager::PasswordStoreChangeList;
 using testing::_;
 using testing::ElementsAreArray;
 using testing::WithArg;
 
-typedef std::vector<PasswordForm*> VectorOfForms;
-
 namespace {
 
 class MockPasswordStoreConsumer
     : public password_manager::PasswordStoreConsumer {
  public:
   MOCK_METHOD1(OnGetPasswordStoreResults,
                void(const std::vector<PasswordForm*>&));
 };
 
 class MockPasswordStoreObserver
@@ skipping 23 matching lines @@
     return false;
   }
 
   bool RemoveLoginsSyncedBetween(
       base::Time delete_begin,
       base::Time delete_end,
       password_manager::PasswordStoreChangeList* changes) override {
     return false;
   }
 
-  bool GetLogins(const PasswordForm& form, PasswordFormList* forms) override {
+  bool GetLogins(const PasswordForm& form,
+                 ScopedVector<autofill::PasswordForm>* forms) override {
     return false;
   }
 
-  bool GetAutofillableLogins(PasswordFormList* forms) override { return false; }
-  bool GetBlacklistLogins(PasswordFormList* forms) override { return false; }
+  bool GetAutofillableLogins(
+      ScopedVector<autofill::PasswordForm>* forms) override {
+    return false;
+  }
+  bool GetBlacklistLogins(
+      ScopedVector<autofill::PasswordForm>* forms) override {
+    return false;
+  }
 };
 
 class MockBackend : public PasswordStoreX::NativeBackend {
  public:
   bool Init() override { return true; }
 
   PasswordStoreChangeList AddLogin(const PasswordForm& form) override {
     all_forms_.push_back(form);
     PasswordStoreChange change(PasswordStoreChange::ADD, form);
     return PasswordStoreChangeList(1, change);
@@ skipping 38 matching lines @@
       if (delete_begin <= all_forms_[i].date_synced &&
           (delete_end.is_null() || all_forms_[i].date_synced < delete_end)) {
         changes->push_back(password_manager::PasswordStoreChange(
             password_manager::PasswordStoreChange::REMOVE, all_forms_[i]));
         erase(i--);
       }
     }
     return true;
   }
 
-  bool GetLogins(const PasswordForm& form, PasswordFormList* forms) override {
+  bool GetLogins(const PasswordForm& form,
+                 ScopedVector<autofill::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]));
     return true;
   }
 
-  bool GetAutofillableLogins(PasswordFormList* forms) override {
+  bool GetAutofillableLogins(
+      ScopedVector<autofill::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]));
     return true;
   }
 
-  bool GetBlacklistLogins(PasswordFormList* forms) override {
+  bool GetBlacklistLogins(
+      ScopedVector<autofill::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]));
     return true;
   }
 
  private:
   void erase(size_t index) {
     if (index < all_forms_.size() - 1)
       all_forms_[index] = all_forms_[all_forms_.size() - 1];
@@ skipping 16 matching lines @@
 
 class MockLoginDatabaseReturn {
  public:
   MOCK_METHOD1(OnLoginDatabaseQueryDone,
                void(const std::vector<PasswordForm*>&));
 };
 
 void LoginDatabaseQueryCallback(password_manager::LoginDatabase* login_db,
                                 bool autofillable,
                                 MockLoginDatabaseReturn* mock_return) {
-  std::vector<PasswordForm*> forms;
+  ScopedVector<autofill::PasswordForm> forms;
   if (autofillable)
     login_db->GetAutofillableLogins(&forms);
   else
     login_db->GetBlacklistLogins(&forms);
-  mock_return->OnLoginDatabaseQueryDone(forms);
+  mock_return->OnLoginDatabaseQueryDone(forms.get());
 }
 
 // Generate |count| expected logins, either auto-fillable or blacklisted.
-void InitExpectedForms(bool autofillable, size_t count, VectorOfForms* forms) {
+void InitExpectedForms(bool autofillable,
+                       size_t count,
+                       ScopedVector<autofill::PasswordForm>* forms) {
   const char* domain = autofillable ? "example" : "blacklisted";
   for (size_t i = 0; i < count; ++i) {
     std::string realm = base::StringPrintf("http://%zu.%s.com", i, domain);
     std::string origin = base::StringPrintf("http://%zu.%s.com/origin",
                                             i, domain);
     std::string action = base::StringPrintf("http://%zu.%s.com/action",
                                             i, domain);
     password_manager::PasswordFormData data = {
         PasswordForm::SCHEME_HTML,
         realm.c_str(),
@@ skipping 116 matching lines @@
 
   // Wait for PasswordStore to execute.
   base::RunLoop().RunUntilIdle();
 
   store->RemoveObserver(&observer);
 
   store->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, NativeMigration) {
-  VectorOfForms expected_autofillable;
+  ScopedVector<autofill::PasswordForm> expected_autofillable;
   InitExpectedForms(true, 50, &expected_autofillable);
 
-  VectorOfForms expected_blacklisted;
+  ScopedVector<autofill::PasswordForm> expected_blacklisted;
   InitExpectedForms(false, 50, &expected_blacklisted);
 
   const base::FilePath login_db_file = test_login_db_file_path();
   scoped_ptr<password_manager::LoginDatabase> login_db(
       new password_manager::LoginDatabase(login_db_file));
   ASSERT_TRUE(login_db->Init());
 
   // Get the initial size of the login DB file, before we populate it.
   // This will be used later to make sure it gets back to this size.
   base::File::Info db_file_start_info;
   ASSERT_TRUE(base::GetFileInfo(login_db_file, &db_file_start_info));
 
   // Populate the login DB with logins that should be migrated.
-  for (VectorOfForms::iterator it = expected_autofillable.begin();
-       it != expected_autofillable.end(); ++it) {
-    login_db->AddLogin(**it);
+  for (const auto* form : expected_autofillable) {
+    login_db->AddLogin(*form);
   }
-  for (VectorOfForms::iterator it = expected_blacklisted.begin();
-       it != expected_blacklisted.end(); ++it) {
-    login_db->AddLogin(**it);
+  for (const auto* form : expected_blacklisted) {
+    login_db->AddLogin(*form);
   }
 
   // Get the new size of the login DB file. We expect it to be larger.
   base::File::Info db_file_full_info;
   ASSERT_TRUE(base::GetFileInfo(login_db_file, &db_file_full_info));
   EXPECT_GT(db_file_full_info.size, db_file_start_info.size);
 
   // Initializing the PasswordStore shouldn't trigger a native migration (yet).
   login_db.reset(new password_manager::LoginDatabase(login_db_file));
   scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
       base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
       login_db.Pass(), GetBackend()));
   store->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // The autofillable forms should have been migrated to the native backend.
-  EXPECT_CALL(consumer,
-      OnGetPasswordStoreResults(
-          ContainsAllPasswordForms(expected_autofillable)))
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults(ContainsAllPasswordForms(
+                            expected_autofillable.get())))
       .WillOnce(WithArg<0>(STLDeleteElements0()));
 
   store->GetAutofillableLogins(&consumer);
   base::RunLoop().RunUntilIdle();
 
   // The blacklisted forms should have been migrated to the native backend.
-  EXPECT_CALL(consumer,
-      OnGetPasswordStoreResults(ContainsAllPasswordForms(expected_blacklisted)))
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults(ContainsAllPasswordForms(
+                            expected_blacklisted.get())))
       .WillOnce(WithArg<0>(STLDeleteElements0()));
 
   store->GetBlacklistLogins(&consumer);
   base::RunLoop().RunUntilIdle();
 
-  VectorOfForms empty;
+  ScopedVector<autofill::PasswordForm> empty;
   MockLoginDatabaseReturn ld_return;
 
   if (GetParam() == WORKING_BACKEND) {
     // No autofillable logins should be left in the login DB.
-    EXPECT_CALL(ld_return,
-                OnLoginDatabaseQueryDone(ContainsAllPasswordForms(empty)));
+    EXPECT_CALL(ld_return, OnLoginDatabaseQueryDone(
+                               ContainsAllPasswordForms(empty.get())));
   } else {
     // The autofillable logins should still be in the login DB.
-    EXPECT_CALL(ld_return,
-                OnLoginDatabaseQueryDone(
-                    ContainsAllPasswordForms(expected_autofillable)))
-        .WillOnce(WithArg<0>(STLDeleteElements0()));
+    EXPECT_CALL(ld_return, OnLoginDatabaseQueryDone(ContainsAllPasswordForms(
+                               expected_autofillable.get())));
   }
 
   LoginDatabaseQueryCallback(store->login_db(), true, &ld_return);
 
   // Wait for the login DB methods to execute.
   base::RunLoop().RunUntilIdle();
 
   if (GetParam() == WORKING_BACKEND) {
     // Likewise, no blacklisted logins should be left in the login DB.
-    EXPECT_CALL(ld_return,
-                OnLoginDatabaseQueryDone(ContainsAllPasswordForms(empty)));
+    EXPECT_CALL(ld_return, OnLoginDatabaseQueryDone(
+                               ContainsAllPasswordForms(empty.get())));
   } else {
     // The blacklisted logins should still be in the login DB.
-    EXPECT_CALL(ld_return,
-                OnLoginDatabaseQueryDone(
-                    ContainsAllPasswordForms(expected_blacklisted)))
-        .WillOnce(WithArg<0>(STLDeleteElements0()));
+    EXPECT_CALL(ld_return, OnLoginDatabaseQueryDone(ContainsAllPasswordForms(
+                               expected_blacklisted.get())));
   }
 
   LoginDatabaseQueryCallback(store->login_db(), false, &ld_return);
 
   // Wait for the login DB methods to execute.
   base::RunLoop().RunUntilIdle();
 
   if (GetParam() == WORKING_BACKEND) {
     // If the migration succeeded, then not only should there be no logins left
     // in the login DB, but also the file should have been deleted and then
     // recreated. We approximate checking for this by checking that the file
     // size is equal to the size before we populated it, even though it was
     // larger after populating it.
     base::File::Info db_file_end_info;
     ASSERT_TRUE(base::GetFileInfo(login_db_file, &db_file_end_info));
     EXPECT_EQ(db_file_start_info.size, db_file_end_info.size);
   }
 
-  STLDeleteElements(&expected_autofillable);
-  STLDeleteElements(&expected_blacklisted);
-
   store->Shutdown();
 }
 
 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));