Index: chrome/browser/sync/test/integration/single_client_apps_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc |
index 275fe11d10b2bebf08fc34e69b6c071fbd0766f0..2d8b246bb10df9b5e0407777bf834dc79b69449c 100644 |
--- a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc |
@@ -4,14 +4,13 @@ |
#include "base/macros.h" |
#include "chrome/browser/sync/test/integration/apps_helper.h" |
-#include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
#include "chrome/browser/sync/test/integration/sync_test.h" |
+#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" |
#include "components/browser_sync/profile_sync_service.h" |
using apps_helper::AllProfilesHaveSameApps; |
using apps_helper::InstallApp; |
using apps_helper::InstallPlatformApp; |
-using sync_integration_test_util::AwaitCommitActivityCompletion; |
class SingleClientAppsSyncTest : public SyncTest { |
public: |
@@ -25,7 +24,6 @@ class SingleClientAppsSyncTest : public SyncTest { |
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) { |
ASSERT_TRUE(SetupSync()); |
- |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |
@@ -39,7 +37,6 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomeLegacyApps) { |
} |
ASSERT_TRUE(SetupSync()); |
- |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |
@@ -53,7 +50,6 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomePlatformApps) { |
} |
ASSERT_TRUE(SetupSync()); |
- |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |
@@ -66,8 +62,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeLegacyApps) { |
InstallApp(verifier(), i); |
} |
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); |
- |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |
@@ -80,8 +75,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomePlatformApps) { |
InstallPlatformApp(verifier(), i); |
} |
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); |
- |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |
@@ -102,7 +96,6 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) { |
InstallPlatformApp(verifier(), i); |
} |
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); |
- |
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
ASSERT_TRUE(AllProfilesHaveSameApps()); |
} |