Index: chrome/browser/password_manager/password_store_x_unittest.cc |
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc |
index 80b8b9a257c799acbf27512fa96c22fd3cf1c0fb..0f45f26d97c7bb7133a817ed4c17afe3d46e2744 100644 |
--- a/chrome/browser/password_manager/password_store_x_unittest.cc |
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc |
@@ -26,7 +26,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
using autofill::PasswordForm; |
-using password_manager::ContainsAllPasswordForms; |
using password_manager::PasswordStoreChange; |
using password_manager::PasswordStoreChangeList; |
using testing::_; |
@@ -38,8 +37,7 @@ namespace { |
class MockPasswordStoreConsumer |
: public password_manager::PasswordStoreConsumer { |
public: |
- MOCK_METHOD1(OnGetPasswordStoreResults, |
- void(const std::vector<PasswordForm*>&)); |
+ MOCK_METHOD0(OnGetPasswordStoreResults, void()); |
}; |
class MockPasswordStoreObserver |
@@ -198,6 +196,12 @@ class MockLoginDatabaseReturn { |
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) { |
@@ -388,20 +392,20 @@ TEST_P(PasswordStoreXTest, NativeMigration) { |
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 On
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; |