WIP: The Bookmark Position Megapatch

chrome/browser/sync/profile_sync_service_password_unittest.cc

Index: chrome/browser/sync/profile_sync_service_password_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 972df35f57b0cc6e100da9ee8965102b5ff71928..25a37b12875ce8acb8f2228537035107f216c4ae 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -419,8 +419,8 @@ TEST_F(ProfileSyncServicePasswordTest, HasNativeEntriesEmptySyncSameUsername) {
   std::vector<PasswordForm> sync_forms;
   GetPasswordEntriesFromSyncDB(&sync_forms);
   ASSERT_EQ(2U, sync_forms.size());
-  EXPECT_TRUE(ComparePasswords(expected_forms[0], sync_forms[1]));
-  EXPECT_TRUE(ComparePasswords(expected_forms[1], sync_forms[0]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[0], sync_forms[0]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[1], sync_forms[1]));
 }
 
 TEST_F(ProfileSyncServicePasswordTest, HasNativeHasSyncNoMerge) {
@@ -477,8 +477,8 @@ TEST_F(ProfileSyncServicePasswordTest, HasNativeHasSyncNoMerge) {
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(2U, new_sync_forms.size());
-  EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
-  EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[1]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[1]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[0]));
 }
 
 // Same as HasNativeHasEmptyNoMerge, but we attempt to aquire a sync transaction
@@ -542,8 +542,8 @@ TEST_F(ProfileSyncServicePasswordTest, EnsureNoTransactions) {
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(2U, new_sync_forms.size());
-  EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
-  EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[1]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[1]));
+  EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[0]));
 }
 
 TEST_F(ProfileSyncServicePasswordTest, HasNativeHasSyncMergeEntry) {