GetLoginsRequest: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/password_store_x_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"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/password_manager/core/browser/password_form_data.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
-using password_manager::ContainsAllPasswordForms;
 using password_manager::PasswordStoreChange;
 using password_manager::PasswordStoreChangeList;
 using testing::_;
 using testing::ElementsAreArray;
 using testing::WithArg;
 
 namespace {
 
 class MockPasswordStoreConsumer
     : public password_manager::PasswordStoreConsumer {
  public:
-  MOCK_METHOD1(OnGetPasswordStoreResults,
-               void(const std::vector<PasswordForm*>&));
+  MOCK_METHOD0(OnGetPasswordStoreResults, void());
 };
 
 class MockPasswordStoreObserver
     : public password_manager::PasswordStore::Observer {
  public:
   MOCK_METHOD1(OnLoginsChanged,
                void(const password_manager::PasswordStoreChangeList& changes));
 };
 
 class FailingBackend : public PasswordStoreX::NativeBackend {
@@ skipping 138 matching lines @@
 
   std::vector<PasswordForm> all_forms_;
 };
 
 class MockLoginDatabaseReturn {
  public:
   MOCK_METHOD1(OnLoginDatabaseQueryDone,
                void(const std::vector<PasswordForm*>&));
 };
 
+// This gmock matcher is used to check that the |arg| contains exactly the same
+// PasswordForms as |forms|, regardless of order.
+MATCHER_P(ContainsAllPasswordForms, forms, "") {
+  return password_manager::ContainsSamePasswordFormsPtr(forms, arg);
+}
+
 void LoginDatabaseQueryCallback(password_manager::LoginDatabase* login_db,
                                 bool autofillable,
                                 MockLoginDatabaseReturn* mock_return) {
   ScopedVector<autofill::PasswordForm> forms;
   if (autofillable)
     login_db->GetAutofillableLogins(&forms);
   else
     login_db->GetBlacklistLogins(&forms);
   mock_return->OnLoginDatabaseQueryDone(forms.get());
 }
@@ skipping 170 matching lines @@
   // Initializing the PasswordStore shouldn't trigger a native migration (yet).
   login_db.reset(new password_manager::LoginDatabase(login_db_file));
   scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
       base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
       login_db.Pass(), GetBackend()));
   store->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // The autofillable forms should have been migrated to the native backend.
-  EXPECT_CALL(consumer, OnGetPasswordStoreResults(ContainsAllPasswordForms(
-                            expected_autofillable.get())))
-      .WillOnce(WithArg<0>(STLDeleteElements0()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults());
 
   store->GetAutofillableLogins(&consumer);
   base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(password_manager::ContainsSamePasswordFormsPtr(

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

This place definitely suffered from the changed OnGetPasswordStoreResults()
interface.

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

Acknowledged.

+      expected_autofillable.get(), consumer.results()->get()));
 
   // The blacklisted forms should have been migrated to the native backend.
-  EXPECT_CALL(consumer, OnGetPasswordStoreResults(ContainsAllPasswordForms(
-                            expected_blacklisted.get())))
-      .WillOnce(WithArg<0>(STLDeleteElements0()));
+  EXPECT_CALL(consumer, OnGetPasswordStoreResults());
 
   store->GetBlacklistLogins(&consumer);
   base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(password_manager::ContainsSamePasswordFormsPtr(
+      expected_blacklisted.get(), consumer.results()->get()));
 
   ScopedVector<autofill::PasswordForm> empty;
   MockLoginDatabaseReturn ld_return;
 
   if (GetParam() == WORKING_BACKEND) {
     // No autofillable logins should be left in the login DB.
     EXPECT_CALL(ld_return, OnLoginDatabaseQueryDone(
                                ContainsAllPasswordForms(empty.get())));
   } else {
     // The autofillable logins should still be in the login DB.
@@ skipping 37 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));