Make test outputs involving PasswordForms more readable.

chrome/browser/sync/test/integration/passwords_helper.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 "chrome/browser/sync/test/integration/passwords_helper.h"
 
+#include <sstream>
+
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 114 matching lines @@
 PasswordStore* GetVerifierPasswordStore() {
   return PasswordStoreFactory::GetForProfile(
              test()->verifier(), ServiceAccessType::IMPLICIT_ACCESS).get();
 }
 
 bool ProfileContainsSamePasswordFormsAsVerifier(int index) {
   ScopedVector<PasswordForm> verifier_forms =
       GetLogins(GetVerifierPasswordStore());
   ScopedVector<PasswordForm> forms = GetLogins(GetPasswordStore(index));
   ClearSyncDateField(&forms.get());
-  bool result = password_manager::ContainsSamePasswordFormsPtr(
-      verifier_forms.get(), forms.get());
-  if (!result) {
-    VLOG(1) << "Password forms in Verifier Profile:";
-    for (const PasswordForm* form : verifier_forms) {
-      VLOG(1) << *form;
-    }
-    VLOG(1) << "Password forms in Profile" << index << ":";
-    for (const PasswordForm* form : forms) {
-      VLOG(1) << *form;
-    }
+
+  std::ostringstream mismatch_details_stream;
+  bool is_matching = password_manager::ContainsEqualPasswordFormsUnordered(
+      verifier_forms.get(), forms.get(), &mismatch_details_stream);
+  if (!is_matching) {
+    VLOG(1) << "Profile " << index
+            << " does not contain the same Password forms as Verifier Profile.";
+    VLOG(1) << mismatch_details_stream.str();
   }
-  return result;
+  return is_matching;
 }
 
 bool ProfilesContainSamePasswordForms(int index_a, int index_b) {
   ScopedVector<PasswordForm> forms_a = GetLogins(GetPasswordStore(index_a));
   ScopedVector<PasswordForm> forms_b = GetLogins(GetPasswordStore(index_b));
   ClearSyncDateField(&forms_a.get());
   ClearSyncDateField(&forms_b.get());
-  bool result = password_manager::ContainsSamePasswordFormsPtr(forms_a.get(),
-                                                               forms_b.get());
-  if (!result) {
-    VLOG(1) << "Password forms in Profile" << index_a << ":";
-    for (const PasswordForm* form : forms_a) {
-      VLOG(1) << *form;
-    }
-    VLOG(1) << "Password forms in Profile" << index_b << ":";
-    for (const PasswordForm* form : forms_b) {
-      VLOG(1) << *form;
-    }
+
+  std::ostringstream mismatch_details_stream;
+  bool is_matching = password_manager::ContainsEqualPasswordFormsUnordered(
+      forms_a.get(), forms_b.get(), &mismatch_details_stream);
+  if (!is_matching) {
+    VLOG(1) << "Password forms in Profile " << index_a
+            << " (listed as 'expected forms' below)"
+            << " do not match those in Profile " << index_b
+            << " (listed as 'actual forms' below)";
+    VLOG(1) << mismatch_details_stream.str();
   }
-  return result;
+  return is_matching;
 }
 
 bool AllProfilesContainSamePasswordFormsAsVerifier() {
   for (int i = 0; i < test()->num_clients(); ++i) {
     if (!ProfileContainsSamePasswordFormsAsVerifier(i)) {
       DVLOG(1) << "Profile " << i << " does not contain the same password"
                                      " forms as the verifier.";
       return false;
     }
   }
@@ skipping 160 matching lines @@
   form.origin = GURL(base::StringPrintf(kIndexedFakeOrigin, index));
   form.username_value =
       base::ASCIIToUTF16(base::StringPrintf("username%d", index));
   form.password_value =
       base::ASCIIToUTF16(base::StringPrintf("password%d", index));
   form.date_created = base::Time::Now();
   return form;
 }
 
 }  // namespace passwords_helper