chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc - Issue 2379433002: [Sync] Refactoring of sync integration test checkers to remove boilerplate await methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

Issue 2379433002: [Sync] Refactoring of sync integration test checkers to remove boilerplate await methods. (Closed)

Patch Set: Rebase Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/themes_helper.cc ('k') | chrome/browser/sync/test/integration/two_client_apps_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

index a4d3e7867bbd39240ec02d1982006b1a3f5c78ed..2c68e160d962fd9417e6d2f658e4200bc98021e3 100644

--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

@@ -14,8 +14,8 @@

#include "chrome/browser/sync/test/integration/extensions_helper.h"

#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

#include "chrome/browser/sync/test/integration/sync_app_list_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 "chrome/browser/ui/app_list/app_list_prefs.h"

#include "chrome/browser/ui/app_list/app_list_syncable_service.h"

#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"

@@ -27,7 +27,6 @@

#include "ui/app_list/app_list_model.h"

#include "ui/app_list/app_list_switches.h"

-using apps_helper::AwaitAllProfilesHaveSameApps;

using apps_helper::DisableApp;

using apps_helper::EnableApp;

using apps_helper::HasSameApps;

@@ -38,7 +37,6 @@ using apps_helper::InstallAppsPendingForSync;

using apps_helper::IsAppEnabled;

using apps_helper::IsIncognitoEnabled;

using apps_helper::UninstallApp;

-using sync_integration_test_util::AwaitCommitActivityCompletion;

namespace {

@@ -366,7 +364,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, DisableApps) {

ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::APP_LIST));

InstallApp(GetProfile(0), 0);

- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));

+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());

ASSERT_FALSE(AllProfilesHaveSameAppList());

ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::APP_LIST));

@@ -386,7 +384,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, DisableSync) {

ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());

InstallApp(GetProfile(0), 0);

- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));

+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());

ASSERT_FALSE(AllProfilesHaveSameAppList());

ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());