| Index: chrome/browser/sync/test/integration/sync_integration_test_util.h
|
| diff --git a/chrome/browser/sync/test/integration/sync_integration_test_util.h b/chrome/browser/sync/test/integration/sync_integration_test_util.h
|
| index 42ab7bdf17fe851dcca719dd73698d867827d457..b24758d328ac40d0c370ed92cc3f213245a7350e 100644
|
| --- a/chrome/browser/sync/test/integration/sync_integration_test_util.h
|
| +++ b/chrome/browser/sync/test/integration/sync_integration_test_util.h
|
| @@ -7,7 +7,9 @@
|
|
|
| #include "components/sync/base/model_type.h"
|
|
|
| +namespace browser_sync {
|
| class ProfileSyncService;
|
| +} // namespace browser_sync
|
|
|
| namespace fake_server {
|
| class FakeServer;
|
| @@ -16,14 +18,14 @@ class FakeServer;
|
| namespace sync_integration_test_util {
|
|
|
| // Wait until the provided |service| is blocked waiting for a passphrase.
|
| -bool AwaitPassphraseRequired(ProfileSyncService* service);
|
| +bool AwaitPassphraseRequired(browser_sync::ProfileSyncService* service);
|
|
|
| // Wait until the provided |service| has accepted the new passphrase.
|
| -bool AwaitPassphraseAccepted(ProfileSyncService* service);
|
| +bool AwaitPassphraseAccepted(browser_sync::ProfileSyncService* service);
|
|
|
| // Wait until the |service| is fully synced.
|
| // This can be a bit flaky. See UpdatedProgressMarkerChecker for details.
|
| -bool AwaitCommitActivityCompletion(ProfileSyncService* service);
|
| +bool AwaitCommitActivityCompletion(browser_sync::ProfileSyncService* service);
|
|
|
| // Wait until the fake server has a specific count for the given type.
|
| bool AwaitServerCount(syncer::ModelType type, size_t count);
|
|
|