GetLoginsRequest: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/password_store_mac_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_mac.h"
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/scoped_observer.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
 using password_manager::LoginDatabase;
 using password_manager::PasswordStore;
 using password_manager::PasswordStoreConsumer;
 using testing::_;
 using testing::DoAll;
 using testing::Invoke;
 using testing::WithArg;
 
 namespace {
 
-ACTION(STLDeleteElements0) {
-  STLDeleteContainerPointers(arg0.begin(), arg0.end());
-}
-
 ACTION(QuitUIMessageLoop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::MessageLoop::current()->Quit();
 }
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
-               void(const std::vector<autofill::PasswordForm*>&));
-
-  void CopyElements(const std::vector<autofill::PasswordForm*>& forms) {
-    last_result.clear();
-    for (size_t i = 0; i < forms.size(); ++i) {
-      last_result.push_back(*forms[i]);
-    }
-  }
+  MOCK_METHOD0(OnGetPasswordStoreResults, void());
 
   // Runs the current thread's message loop until OnGetPasswordStoreResults()
   // is posted to it. This method should be called immediately after GetLogins,
   // without pumping the message loop in-between.
   void WaitOnGetPasswordStoreResults() {
-    EXPECT_CALL(*this, OnGetPasswordStoreResults(_)).WillOnce(DoAll(
-        WithArg<0>(Invoke(this, &MockPasswordStoreConsumer::CopyElements)),
-        WithArg<0>(STLDeleteElements0()),
-        QuitUIMessageLoop()));
+    EXPECT_CALL(*this, OnGetPasswordStoreResults())
+        .WillOnce(QuitUIMessageLoop());
     base::MessageLoop::current()->Run();
   }
-
-  std::vector<PasswordForm> last_result;
 };
 
 class MockPasswordStoreObserver : public PasswordStore::Observer {
  public:
   MOCK_METHOD1(OnLoginsChanged,
                void(const password_manager::PasswordStoreChangeList& changes));
 };
 
 // A mock LoginDatabase that simulates a failing Init() method.
 class BadLoginDatabase : public password_manager::LoginDatabase {
@@ skipping 1187 matching lines @@
   owned_keychain_adapter.AddPassword(*www_form);
 
   // 2. Get a password for m.facebook.com.
   PasswordForm m_form(*www_form);
   m_form.signon_realm = "http://m.facebook.com";
   m_form.origin = GURL("http://m.facebook.com/index.html");
 
   MockPasswordStoreConsumer consumer;
   store_->GetLogins(m_form, PasswordStore::ALLOW_PROMPT, &consumer);
   consumer.WaitOnGetPasswordStoreResults();
-  EXPECT_EQ(1u, consumer.last_result.size());
+  EXPECT_EQ(1u, consumer.results()->size());
 
   // 3. Add the returned password for m.facebook.com.
-  login_db()->AddLogin(consumer.last_result[0]);
+  login_db()->AddLogin(*(*consumer.results())[0]);
   owned_keychain_adapter.AddPassword(m_form);
 
   // 4. Remove both passwords.
   store_->RemoveLogin(*www_form);
   store_->RemoveLogin(m_form);
   FinishAsyncProcessing();
 
   // No trace of www.facebook.com.
   ScopedVector<autofill::PasswordForm> matching_items =
       owned_keychain_adapter.PasswordsFillingForm(www_form->signon_realm,
@@ skipping 215 matching lines @@
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(www_form_data));
   store()->AddLogin(*form);
 
   MockPasswordStoreConsumer mock_consumer;
   store()->GetLogins(*form, PasswordStore::ALLOW_PROMPT, &mock_consumer);
 
   // Now the read/write tasks are scheduled, let the DB initialization proceed.
   event.Signal();
 
   mock_consumer.WaitOnGetPasswordStoreResults();
-  EXPECT_EQ(1u, mock_consumer.last_result.size());
+  EXPECT_EQ(1u, mock_consumer.results()->size());
   EXPECT_TRUE(login_db());
 }
 
 // Verify that operations on a PasswordStore with a bad database cause no
 // explosions, but fail without side effect, return no data and trigger no
 // notifications.
 TEST_F(PasswordStoreMacTest, OperationsOnABadDatabaseSilentlyFail) {
   ClosePasswordStore();
   CreateAndInitPasswordStore(
       make_scoped_ptr<password_manager::LoginDatabase>(new BadLoginDatabase));
@@ skipping 15 matching lines @@
   blacklisted_form->action = GURL("http://foo.example.com/action");
   blacklisted_form->blacklisted_by_user = true;
   store()->AddLogin(*form);
   store()->AddLogin(*blacklisted_form);
   FinishAsyncProcessing();
 
   // Get all logins; autofillable logins; blacklisted logins.
   MockPasswordStoreConsumer mock_consumer;
   store()->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &mock_consumer);
   mock_consumer.WaitOnGetPasswordStoreResults();
-  EXPECT_TRUE(mock_consumer.last_result.empty());
+  EXPECT_TRUE(mock_consumer.results()->empty());
   store()->GetAutofillableLogins(&mock_consumer);
   mock_consumer.WaitOnGetPasswordStoreResults();
-  EXPECT_TRUE(mock_consumer.last_result.empty());
+  EXPECT_TRUE(mock_consumer.results()->empty());
   store()->GetBlacklistLogins(&mock_consumer);
   mock_consumer.WaitOnGetPasswordStoreResults();
-  EXPECT_TRUE(mock_consumer.last_result.empty());
+  EXPECT_TRUE(mock_consumer.results()->empty());
 
   // Report metrics.
   store()->ReportMetrics("Test Username", true);
   FinishAsyncProcessing();
 
   // Change the login.
   form->password_value = base::ASCIIToUTF16("a different password");
   store()->UpdateLogin(*form);
   FinishAsyncProcessing();
 
   // Delete one login; a range of logins.
   store()->RemoveLogin(*form);
   store()->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max());
   store()->RemoveLoginsSyncedBetween(base::Time(), base::Time::Max());
   FinishAsyncProcessing();
 
   // Verify no notifications are fired during shutdown either.
   ClosePasswordStore();
 }