diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-22 00:52:59 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-22 00:52:59 +0000 |
| commit | 059ca085ce52beb7c186332700959553dade21b2 (patch) | |
| tree | a36bccb8f5a92e422b816b3c43b853851cac7b0b /chrome | |
| parent | 92056b95525a92217684e0b3df68cf371d77fd55 (diff) | |
| download | chromium_src-059ca085ce52beb7c186332700959553dade21b2.zip chromium_src-059ca085ce52beb7c186332700959553dade21b2.tar.gz chromium_src-059ca085ce52beb7c186332700959553dade21b2.tar.bz2 | |
Fix for bug 44624: Updating calls to AwaitMutualSyncCycleCompletion.
The AutoFill integration tests were calling AwaitMutualSyncCycleCompletion()
incorrectly in some cases. This patch fixes the calls based
on which client made an update. The tests now pass with this
fix.
BUG=44624
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/2100012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/live_sync/two_client_live_autofill_sync_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/live_sync/two_client_live_autofill_sync_unittest.cc b/chrome/test/live_sync/two_client_live_autofill_sync_unittest.cc index 8e96ab0..764c671 100644 --- a/chrome/test/live_sync/two_client_live_autofill_sync_unittest.cc +++ b/chrome/test/live_sync/two_client_live_autofill_sync_unittest.cc @@ -569,7 +569,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ProfileSteady) { 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_))); @@ -593,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ProfileSteady) { 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_))); @@ -618,7 +618,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ProfileSteady) { 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_))); |