PasswordStore: Clean up expectations about rewriting vectors 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 64 matching lines @@
 
   bool RemoveLoginsSyncedBetween(
       base::Time delete_begin,
       base::Time delete_end,
       password_manager::PasswordStoreChangeList* changes) override {
     return false;
   }
 
   bool GetLogins(const PasswordForm& form,
                  ScopedVector<autofill::PasswordForm>* forms) override {
+    forms->clear();
     return false;
   }
 
   bool GetAutofillableLogins(
       ScopedVector<autofill::PasswordForm>* forms) override {
+    forms->clear();
     return false;
   }
   bool GetBlacklistLogins(
       ScopedVector<autofill::PasswordForm>* forms) override {
+    forms->clear();
     return false;
   }
 };
 
 class MockBackend : public PasswordStoreX::NativeBackend {
  public:
   bool Init() override { return true; }
 
   PasswordStoreChangeList AddLogin(const PasswordForm& form) override {
     all_forms_.push_back(form);
@@ skipping 96 matching lines @@
  public:
   MOCK_METHOD1(OnLoginDatabaseQueryDone,
                void(const std::vector<PasswordForm*>&));
 };
 
 void LoginDatabaseQueryCallback(password_manager::LoginDatabase* login_db,
                                 bool autofillable,
                                 MockLoginDatabaseReturn* mock_return) {
   ScopedVector<autofill::PasswordForm> forms;
   if (autofillable)
-    login_db->GetAutofillableLogins(&forms);
+    EXPECT_TRUE(login_db->GetAutofillableLogins(&forms));
   else
-    login_db->GetBlacklistLogins(&forms);
+    EXPECT_TRUE(login_db->GetBlacklistLogins(&forms));
   mock_return->OnLoginDatabaseQueryDone(forms.get());
 }
 
 // Generate |count| expected logins, either auto-fillable or blacklisted.
 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);
@@ skipping 236 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));