Fix failing sync integration tests.

chrome/test/live_sync/two_client_live_autofill_sync_test.cc

 // Copyright (c) 2010 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 "base/utf_string_conversions.h"
 #include "chrome/test/live_sync/live_autofill_sync_test.h"
 
-// TODO(rsimha): Remove FAILS prefix after crbug.com/51956 is fixed.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
-                       FAILS_Client1HasData) {
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, Client1HasData) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutofillKeys keys;
   keys.insert(AutofillKey("name0", "value0"));
   keys.insert(AutofillKey("name0", "value1"));
   keys.insert(AutofillKey("name1", "value2"));
   keys.insert(AutofillKey(WideToUTF16(L"Sigur R\u00F3s"),
                           WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
   AddFormFieldsToWebData(GetWebDataService(0), keys);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
   AutofillKeys wd1_keys;
   GetAllAutofillKeys(GetWebDataService(1), &wd1_keys);
-  EXPECT_EQ(keys, wd1_keys);
+
+  // Note: In this test, name0-value0 and name0-value1 were both added in the
+  // same transaction on Client0. However, only the first entry with name0 is
+  // added, due to changes made in r55781. See crbug.com/51727.
+  AutofillKeys expected_keys;
+  expected_keys.insert(AutofillKey("name0", "value0"));
+  expected_keys.insert(AutofillKey("name1", "value2"));
+  expected_keys.insert(AutofillKey(WideToUTF16(L"Sigur R\u00F3s"),
+                                   WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
+  EXPECT_EQ(expected_keys, wd1_keys);
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, BothHaveData) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutofillKeys keys1;
   keys1.insert(AutofillKey("name0", "value0"));
-  keys1.insert(AutofillKey("name0", "value1"));
   keys1.insert(AutofillKey("name1", "value2"));
   AddFormFieldsToWebData(GetWebDataService(0), keys1);
 
   AutofillKeys keys2;
   keys2.insert(AutofillKey("name0", "value1"));
-  keys2.insert(AutofillKey("name1", "value2"));
   keys2.insert(AutofillKey("name2", "value3"));
   keys2.insert(AutofillKey("name3", "value3"));
   AddFormFieldsToWebData(GetWebDataService(1), keys2);
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   EXPECT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
 
+  // Note: In this test, name0-value0 and name0-value1 were added in separate
+  // transactions -- one on Client0 and the other on Client1. Therefore, we
+  // expect to see both pairs once sync completes and the lists are merged.
   AutofillKeys expected_keys;
   expected_keys.insert(AutofillKey("name0", "value0"));
   expected_keys.insert(AutofillKey("name0", "value1"));
   expected_keys.insert(AutofillKey("name1", "value2"));
   expected_keys.insert(AutofillKey("name2", "value3"));
   expected_keys.insert(AutofillKey("name3", "value3"));
 
   AutofillKeys wd0_keys;
   GetAllAutofillKeys(GetWebDataService(0), &wd0_keys);
   EXPECT_EQ(expected_keys, wd0_keys);
@@ skipping 221 matching lines @@
   STLDeleteElements(&expected_profiles);
   RemoveProfile(GetPersonalDataManager(1), ASCIIToUTF16("Billing"));
   RemoveProfile(GetPersonalDataManager(1), ASCIIToUTF16("Billing2"));
   EXPECT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(0))));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
 }