GetLoginsRequest: Use ScopedVector to express ownership of forms

components/password_manager/core/browser/password_store_default_unittest.cc

Index: components/password_manager/core/browser/password_store_default_unittest.cc
diff --git a/components/password_manager/core/browser/password_store_default_unittest.cc b/components/password_manager/core/browser/password_store_default_unittest.cc
index b4d87c35839f8eeb074149f2f2fb542748960c54..9a1b6758c090801c21dd2104056340bd4e3ba43d 100644
--- a/components/password_manager/core/browser/password_store_default_unittest.cc
+++ b/components/password_manager/core/browser/password_store_default_unittest.cc
@@ -31,8 +31,7 @@ namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
-               void(const std::vector<PasswordForm*>&));
+  MOCK_METHOD0(OnGetPasswordStoreResults, void());
 };
 
 class MockPasswordStoreObserver : public PasswordStore::Observer {
@@ -114,11 +113,10 @@ TEST_F(PasswordStoreDefaultTest, NonASCIIData) {
   };
 
   // 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();
@@ -126,14 +124,13 @@ TEST_F(PasswordStoreDefaultTest, NonASCIIData) {
   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();
 }
@@ -220,17 +217,20 @@ TEST_F(PasswordStoreDefaultTest, OperationsOnABadDatabaseSilentlyFail) {
 
   // 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);