Fix for bug 44624: Updating calls to AwaitMutualSyncCycleCompletion.

chrome/test/live_sync/two_client_live_autofill_sync_unittest.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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/ref_counted.h"
 #include "base/stl_util-inl.h"
@@ skipping 551 matching lines @@
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   // Client2 adds a profile.
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(MARION, expected_profiles[1]);
   AddProfile(pdm2_, *expected_profiles[1]);
-  EXPECT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
+  EXPECT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   // Client1 adds a conflicting profile.
   expected_profiles.push_back(new AutoFillProfile(string16(), 0));
   FillProfile(MARION, expected_profiles[2]);
   AddProfile(pdm1_, *expected_profiles[2]);
   EXPECT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
 
   // The conflicting profile's label will be made unique.
   expected_profiles[2]->set_label(ASCIIToUTF16("Billing2"));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   // Client2 removes a profile.
   delete expected_profiles.front();
   expected_profiles.erase(expected_profiles.begin());
   RemoveProfile(pdm2_, ASCIIToUTF16("Shipping"));
-  EXPECT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
+  EXPECT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   // Client1 updates a profile.
   expected_profiles[0]->SetInfo(AutoFillType(NAME_FIRST),
                                 ASCIIToUTF16("Bart"));
   UpdateProfile(pdm1_,
                 ASCIIToUTF16("Billing"),
                 AutoFillType(NAME_FIRST),
                 ASCIIToUTF16("Bart"));
   EXPECT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   // Client2 removes everything.
   STLDeleteElements(&expected_profiles);
   RemoveProfile(pdm2_, ASCIIToUTF16("Billing"));
   RemoveProfile(pdm2_, ASCIIToUTF16("Billing2"));
-  EXPECT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
+  EXPECT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
 
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm1_)));
   EXPECT_TRUE(CompareAutoFillProfiles(expected_profiles,
                                       GetAllAutoFillProfiles(pdm2_)));
 
   Cleanup();
 }