GetLoginsRequest: Use ScopedVector to express ownership of forms

components/password_manager/core/browser/password_store_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/files/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "components/password_manager/core/browser/password_form_data.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/password_store_default.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
 using base::WaitableEvent;
 using testing::_;
 using testing::DoAll;
 using testing::WithArg;
 
 namespace password_manager {
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
+  MOCK_METHOD1(OnGetPasswordStoreResultsConstRef,
                void(const std::vector<PasswordForm*>&));
+
+  // GMock cannot mock methods with move-only args.
+  void OnGetPasswordStoreResults(ScopedVector<PasswordForm> results) override {
+    OnGetPasswordStoreResultsConstRef(results.get());
+  }
 };
 
 class StartSyncFlareMock {
  public:
   StartSyncFlareMock() {}
   ~StartSyncFlareMock() {}
 
   MOCK_METHOD1(StartSyncFlare, void(syncer::ModelType));
 };
 
@@ skipping 81 matching lines @@
       "http://bar.example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"username_value",
       L"",
       true, false, cutoff - 1 },
   };
 
   // Build the forms vector and add the forms to the store.
-  std::vector<PasswordForm*> all_forms;
+  ScopedVector<PasswordForm> all_forms;
   for (size_t i = 0; i < arraysize(form_data); ++i) {
-    PasswordForm* form = CreatePasswordFormFromData(form_data[i]);
-    all_forms.push_back(form);
-    store->AddLogin(*form);
+    all_forms.push_back(CreatePasswordFormFromData(form_data[i]).release());
+    store->AddLogin(*all_forms.back());
   }
   base::MessageLoop::current()->RunUntilIdle();
 
   // We expect to get back only the "recent" www.google.com login.
   // Theoretically these should never actually exist since there are no longer
   // any login forms on www.google.com to save, but we technically allow them.
   // We should not get back the older saved password though.
   PasswordForm www_google;
   www_google.scheme = PasswordForm::SCHEME_HTML;
   www_google.signon_realm = "https://www.google.com";
   std::vector<PasswordForm*> www_google_expected;
   www_google_expected.push_back(all_forms[2]);
 
   // We should still get the accounts.google.com login even though it's older
   // than our cutoff - this is the new location of all Google login forms.
   PasswordForm accounts_google;
   accounts_google.scheme = PasswordForm::SCHEME_HTML;
   accounts_google.signon_realm = "https://accounts.google.com";
   std::vector<PasswordForm*> accounts_google_expected;
   accounts_google_expected.push_back(all_forms[3]);
 
   // Same thing for a generic saved login.
   PasswordForm bar_example;
   bar_example.scheme = PasswordForm::SCHEME_HTML;
   bar_example.signon_realm = "http://bar.example.com";
   std::vector<PasswordForm*> bar_example_expected;
   bar_example_expected.push_back(all_forms[4]);
 
   MockPasswordStoreConsumer consumer;
-
-  // Expect the appropriate replies, as above, in reverse order than we will
-  // issue the queries. Each retires on saturation to avoid matcher spew.
-  EXPECT_CALL(consumer, OnGetPasswordStoreResults(
-                            ContainsAllPasswordForms(bar_example_expected)))
-      .WillOnce(WithArg<0>(STLDeleteElements0()))
+  testing::InSequence s;
+  EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(
+                            ContainsSamePasswordForms(www_google_expected)))
       .RetiresOnSaturation();

[vasilii, 2015/02/09 10:08:35]

I'm not sure if you need it here and below. The expected forms seem different.

[vabr (Chromium), 2015/02/09 11:36:06]

I do need it. Without the saturation the expectations spew logs about unexpected
calls.

-  EXPECT_CALL(consumer, OnGetPasswordStoreResults(
-                            ContainsAllPasswordForms(accounts_google_expected)))
-      .WillOnce(WithArg<0>(STLDeleteElements0()))
-      .RetiresOnSaturation();
-  EXPECT_CALL(consumer, OnGetPasswordStoreResults(
-                            ContainsAllPasswordForms(www_google_expected)))
-      .WillOnce(WithArg<0>(STLDeleteElements0()))
+  EXPECT_CALL(consumer,
+              OnGetPasswordStoreResultsConstRef(ContainsSamePasswordForms(
+                  accounts_google_expected))).RetiresOnSaturation();
+  EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(
+                            ContainsSamePasswordForms(bar_example_expected)))
       .RetiresOnSaturation();
 
   store->GetLogins(www_google, PasswordStore::ALLOW_PROMPT, &consumer);
   store->GetLogins(accounts_google, PasswordStore::ALLOW_PROMPT, &consumer);
   store->GetLogins(bar_example, PasswordStore::ALLOW_PROMPT, &consumer);
 
   base::MessageLoop::current()->RunUntilIdle();
 
-  STLDeleteElements(&all_forms);
   store->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 TEST_F(PasswordStoreTest, StartSyncFlare) {
   scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
       base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
       make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
   StartSyncFlareMock mock;
   store->Init(
       base::Bind(&StartSyncFlareMock::StartSyncFlare, base::Unretained(&mock)));
   {
     PasswordForm form;
     form.origin = GURL("http://accounts.google.com/LoginAuth");
     form.signon_realm = "http://accounts.google.com/";
     EXPECT_CALL(mock, StartSyncFlare(syncer::PASSWORDS));
     store->AddLogin(form);
     base::MessageLoop::current()->RunUntilIdle();
   }
   store->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace password_manager