Make test outputs involving PasswordForms more readable.

chrome/browser/password_manager/password_store_win_unittest.cc

Index: chrome/browser/password_manager/password_store_win_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index e21eac9a41893e1954b1421561f6e9504167f269..177c62cee3c3fc5cd5aa9928e5e948a22d278852 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -33,11 +33,11 @@
 using autofill::PasswordForm;
 using base::WaitableEvent;
 using content::BrowserThread;
-using password_manager::ContainsSamePasswordForms;
 using password_manager::LoginDatabase;
 using password_manager::PasswordFormData;
 using password_manager::PasswordStore;
 using password_manager::PasswordStoreConsumer;
+using password_manager::UnorderedPasswordFormElementsAre;
 using testing::_;
 using testing::DoAll;
 using testing::IsEmpty;
@@ -252,8 +252,9 @@ TEST_F(PasswordStoreWinTest, DISABLED_ConvertIE7Login) {
       CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // The IE7 password should be returned.
-  EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(
-                            ContainsSamePasswordForms(expected_forms.get())));
+  EXPECT_CALL(consumer,
+              OnGetPasswordStoreResultsConstRef(
+                  UnorderedPasswordFormElementsAre(expected_forms.get())));
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
@@ -347,7 +348,7 @@ TEST_F(PasswordStoreWinTest, DISABLED_MultipleWDSQueriesOnDifferentThreads) {
   // The IE7 password should be returned.
   EXPECT_CALL(password_consumer,
               OnGetPasswordStoreResultsConstRef(
-                  ContainsSamePasswordForms(expected_forms.get())));
+                  UnorderedPasswordFormElementsAre(expected_forms.get())));
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &password_consumer);