GetLoginsRequest: Use ScopedVector to express ownership of forms

components/password_manager/core/browser/password_store_default_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 13 matching lines @@
 using testing::_;
 using testing::ElementsAreArray;
 using testing::WithArg;
 
 namespace password_manager {
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
-               void(const std::vector<PasswordForm*>&));
+  MOCK_METHOD0(OnGetPasswordStoreResults, void());
 };
 
 class MockPasswordStoreObserver : public PasswordStore::Observer {
  public:
   MOCK_METHOD1(OnLoginsChanged, void(const PasswordStoreChangeList& changes));
 };
 
 // A mock LoginDatabase that simulates a failing Init() method.
 class BadLoginDatabase : public LoginDatabase {
  public:
@@ skipping 61 matching lines @@
       "http://foo.example.com/action",
       L"มีสีสัน",
       L"お元気ですか?",
       L"盆栽",
       L"أحب كرة",
       L"£éä국수çà",
       true, false, 1 },
   };
 
   // Build the expected forms vector and add the forms to the store.
-  std::vector<PasswordForm*> expected_forms;
+  ScopedVector<PasswordForm> expected_forms;
   for (unsigned int i = 0; i < arraysize(form_data); ++i) {
-    PasswordForm* form = CreatePasswordFormFromData(form_data[i]);
-    expected_forms.push_back(form);
-    store->AddLogin(*form);
+    expected_forms.push_back(CreatePasswordFormFromData(form_data[i]));
+    store->AddLogin(*expected_forms.back());
   }
 
   base::MessageLoop::current()->RunUntilIdle();
 
   MockPasswordStoreConsumer consumer;
 
   // We expect to get the same data back, even though it's not all ASCII.
-  EXPECT_CALL(consumer,
-      OnGetPasswordStoreResults(ContainsAllPasswordForms(expected_forms)))
-      .WillOnce(WithArg<0>(STLDeleteElements0()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults());
   store->GetAutofillableLogins(&consumer);
 
   base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_TRUE(ContainsSamePasswordFormsPtr(expected_forms.get(),
+                                           consumer.results()->get()));
 
-  STLDeleteElements(&expected_forms);
   store->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 TEST_F(PasswordStoreDefaultTest, Notifications) {
   scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
       base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
       make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
   store->Init(syncer::SyncableService::StartSyncFlare());
 
@@ skipping 66 matching lines @@
   blacklisted_form->signon_realm = "http://foo.example.com";
   blacklisted_form->origin = GURL("http://foo.example.com/origin");
   blacklisted_form->action = GURL("http://foo.example.com/action");
   blacklisted_form->blacklisted_by_user = true;
   bad_store->AddLogin(*form);
   bad_store->AddLogin(*blacklisted_form);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Get all logins; autofillable logins; blacklisted logins.
   testing::StrictMock<MockPasswordStoreConsumer> mock_consumer;
-  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults(testing::ElementsAre()));
+  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults());
   bad_store->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &mock_consumer);
   base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_EQ(0u, mock_consumer.results()->size());
   testing::Mock::VerifyAndClearExpectations(&mock_consumer);
-  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults(testing::ElementsAre()));
+  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults());
   bad_store->GetAutofillableLogins(&mock_consumer);
   base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_EQ(0u, mock_consumer.results()->size());
   testing::Mock::VerifyAndClearExpectations(&mock_consumer);
-  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults(testing::ElementsAre()));
+  EXPECT_CALL(mock_consumer, OnGetPasswordStoreResults());
   bad_store->GetBlacklistLogins(&mock_consumer);
   base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_EQ(0u, mock_consumer.results()->size());
 
   // Report metrics.
   bad_store->ReportMetrics("Test Username", true);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Change the login.
   form->password_value = base::ASCIIToUTF16("a different password");
   bad_store->UpdateLogin(*form);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Delete one login; a range of logins.
   bad_store->RemoveLogin(*form);
   base::MessageLoop::current()->RunUntilIdle();
   bad_store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max());
   base::MessageLoop::current()->RunUntilIdle();
   bad_store->RemoveLoginsSyncedBetween(base::Time(), base::Time::Max());
   base::MessageLoop::current()->RunUntilIdle();
 
   // Ensure no notifications and no explosions during shutdown either.
   bad_store->RemoveObserver(&mock_observer);
   bad_store->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace password_manager