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

Unified Diff: chrome/browser/sync/test/integration/single_client_themes_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/single_client_status_change_checker.cc ('k') | chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 816fdc80245257fe0f8d3c114115531bd3091d7e..ce5099f5d290bdf5dafdc0b43329c9cc5098788b 100644

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

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

@@ -4,12 +4,11 @@

#include "base/macros.h"

#include "build/build_config.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/themes_helper.h"

+#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"

#include "components/browser_sync/profile_sync_service.h"

-using sync_integration_test_util::AwaitCommitActivityCompletion;

using themes_helper::GetCustomTheme;

using themes_helper::GetThemeID;

using themes_helper::UseCustomTheme;

@@ -43,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, CustomTheme) {

ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));

ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));

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

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

ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));

ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));

@@ -62,14 +61,14 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) {

ASSERT_FALSE(UsingSystemTheme(GetProfile(0)));

ASSERT_FALSE(UsingSystemTheme(verifier()));

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

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

UseSystemTheme(GetProfile(0));

UseSystemTheme(verifier());

ASSERT_TRUE(UsingSystemTheme(GetProfile(0)));

ASSERT_TRUE(UsingSystemTheme(verifier()));

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

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

ASSERT_TRUE(UsingSystemTheme(GetProfile(0)));

ASSERT_TRUE(UsingSystemTheme(verifier()));

@@ -83,14 +82,14 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DefaultTheme) {

ASSERT_FALSE(UsingDefaultTheme(GetProfile(0)));

ASSERT_FALSE(UsingDefaultTheme(verifier()));

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

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

UseDefaultTheme(GetProfile(0));

UseDefaultTheme(verifier());

ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));

ASSERT_TRUE(UsingDefaultTheme(verifier()));

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

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

ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));

ASSERT_TRUE(UsingDefaultTheme(verifier()));