GetLoginsRequest: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/password_store_win_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 <windows.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "components/webdata/common/web_database_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "crypto/wincrypt_shim.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
 using base::WaitableEvent;
 using content::BrowserThread;
 using password_manager::LoginDatabase;
-using password_manager::ContainsAllPasswordForms;
 using password_manager::PasswordFormData;
 using password_manager::PasswordStore;
 using password_manager::PasswordStoreConsumer;
 using testing::_;
 using testing::DoAll;
 using testing::WithArg;
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
-               void(const std::vector<autofill::PasswordForm*>&));
+  MOCK_METHOD0(OnGetPasswordStoreResults, void());
 };
 
 class MockWebDataServiceConsumer : public WebDataServiceConsumer {
 public:
   MOCK_METHOD2(OnWebDataServiceRequestDone,
                void(PasswordWebDataService::Handle, const WDTypedResult*));
 };
 
 }  // anonymous namespace
 
-typedef std::vector<PasswordForm*> VectorOfForms;
-
 class PasswordStoreWinTest : public testing::Test {
  protected:
   PasswordStoreWinTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {
   }
 
   bool CreateIE7PasswordInfo(const std::wstring& url, const base::Time& created,
                              IE7PasswordInfo* info) {
     // Copied from chrome/browser/importer/importer_unittest.cc
@@ skipping 131 matching lines @@
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
 
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
-  ON_CALL(consumer, OnGetPasswordStoreResults(_))
+  ON_CALL(consumer, OnGetPasswordStoreResults())
       .WillByDefault(QuitUIMessageLoop());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
@@ skipping 10 matching lines @@
     "http://example.com/",
     "http://example.com/origin",
     "",
     L"",
     L"",
     L"",
     L"abcdefgh",
     L"abcdefghijkl",
     true, false, 1,
   };
-  std::vector<PasswordForm*> forms;
-  forms.push_back(CreatePasswordFormFromData(expected_form_data));
+  scoped_ptr<autofill::PasswordForm> expected_form(
+      CreatePasswordFormFromData(expected_form_data));

[vasilii, 2015/02/03 19:22:16]

Did you consider changing this function to return scoped_ptr?

[vabr (Chromium), 2015/02/04 16:13:44]

Good idea! Done.

I updated both copies of the function, and uploaded a separate CL to merge those
copies later. https://codereview.chromium.org/896903003/

 
   // The IE7 password should be returned.
-  EXPECT_CALL(consumer,
-              OnGetPasswordStoreResults(ContainsAllPasswordForms(forms)))
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults())
       .WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
 
-  STLDeleteElements(&forms);
+  EXPECT_EQ(1u, consumer.results()->size());
+  EXPECT_EQ(*expected_form, *consumer.results()->back());
 }
 
 // Crashy.  http://crbug.com/86558
 TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
@@ skipping 32 matching lines @@
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
 
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
   MockPasswordStoreConsumer password_consumer;
   // Make sure we quit the MessageLoop even if the test fails.
-  ON_CALL(password_consumer, OnGetPasswordStoreResults(_))
+  ON_CALL(password_consumer, OnGetPasswordStoreResults())
       .WillByDefault(QuitUIMessageLoop());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(form_data));
 
   PasswordFormData expected_form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"abcdefgh",
     L"abcdefghijkl",
     true, false, 1,
   };
-  std::vector<PasswordForm*> forms;
-  forms.push_back(CreatePasswordFormFromData(expected_form_data));
+  scoped_ptr<autofill::PasswordForm> expected_form(
+      CreatePasswordFormFromData(expected_form_data));
 
   // The IE7 password should be returned.
-  EXPECT_CALL(password_consumer,
-              OnGetPasswordStoreResults(ContainsAllPasswordForms(forms)))
+  EXPECT_CALL(password_consumer, OnGetPasswordStoreResults())
       .WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &password_consumer);
 
   MockWebDataServiceConsumer wds_consumer;
 
   EXPECT_CALL(wds_consumer,
               OnWebDataServiceRequestDone(_, _))
       .WillOnce(QuitUIMessageLoop());
 
   wds_->GetIE7Login(password_info, &wds_consumer);
 
   // Run the MessageLoop twice: once for the GetIE7Login that PasswordStoreWin
   // schedules on the DB thread and once for the one we just scheduled on the UI
   // thread.
   base::MessageLoop::current()->Run();
   base::MessageLoop::current()->Run();
 
-  STLDeleteElements(&forms);
+  EXPECT_EQ(1u, password_consumer.results()->size());
+  EXPECT_EQ(*expected_form, *password_consumer.results()->back());
 }
 
 TEST_F(PasswordStoreWinTest, EmptyLogins) {
   store_ = CreatePasswordStore();
   store_->Init(syncer::SyncableService::StartSyncFlare());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(form_data));
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
-  ON_CALL(consumer, OnGetPasswordStoreResults(_))
+  ON_CALL(consumer, OnGetPasswordStoreResults())
       .WillByDefault(QuitUIMessageLoop());
 
-  VectorOfForms expect_none;
-  // expect that we get no results;
-  EXPECT_CALL(consumer,
-              OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
-      .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults())
+      .WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
+
+  EXPECT_EQ(0u, consumer.results()->size());
 }
 
 TEST_F(PasswordStoreWinTest, EmptyBlacklistLogins) {
   store_ = CreatePasswordStore();
   store_->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
-  ON_CALL(consumer, OnGetPasswordStoreResults(_))
+  ON_CALL(consumer, OnGetPasswordStoreResults())
       .WillByDefault(QuitUIMessageLoop());
 
-  VectorOfForms expect_none;
-  // expect that we get no results;
-  EXPECT_CALL(
-      consumer,
-      OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
-      .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults())
+      .WillOnce(QuitUIMessageLoop());
 
   store_->GetBlacklistLogins(&consumer);
   base::MessageLoop::current()->Run();
+
+  EXPECT_EQ(0u, consumer.results()->size());
 }
 
 TEST_F(PasswordStoreWinTest, EmptyAutofillableLogins) {
   store_ = CreatePasswordStore();
   store_->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
-  ON_CALL(consumer, OnGetPasswordStoreResults(_))
+  ON_CALL(consumer, OnGetPasswordStoreResults())
       .WillByDefault(QuitUIMessageLoop());
 
-  VectorOfForms expect_none;
-  // expect that we get no results;
-  EXPECT_CALL(
-      consumer,
-      OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
-      .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults())
+      .WillOnce(QuitUIMessageLoop());
 
   store_->GetAutofillableLogins(&consumer);
   base::MessageLoop::current()->Run();
+
+  EXPECT_EQ(0u, consumer.results()->size());
 }