Make test outputs involving PasswordForms more readable.

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 15 matching lines @@
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #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::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;
 using testing::WithArg;
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
   MOCK_METHOD1(OnGetPasswordStoreResultsConstRef,
@@ skipping 194 matching lines @@
     L"",
     L"abcdefgh",
     L"abcdefghijkl",
     true, false, 1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
   expected_forms.push_back(
       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();
 }
 
 // Crashy.  http://crbug.com/86558
 TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
@@ skipping 73 matching lines @@
     L"abcdefghijkl",
     true, false, 1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
   expected_forms.push_back(
       CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // 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);
 
   MockWebDataServiceConsumer wds_consumer;
 
   EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDone(_, _))
       .WillOnce(QuitUIMessageLoop());
 
   wds_->GetIE7Login(password_info, &wds_consumer);
 
@@ skipping 59 matching lines @@
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
 
   store_->GetAutofillableLogins(&consumer);
   base::MessageLoop::current()->Run();
 }