| Index: chrome/browser/sync/profile_sync_service_harness.h
|
| diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h
|
| index 35bb19a110da811cd4dcc3c6b673aa1bcea36c0a..19f7e5b8fc83ecab36fd8369cf60a1be572527b9 100644
|
| --- a/chrome/browser/sync/profile_sync_service_harness.h
|
| +++ b/chrome/browser/sync/profile_sync_service_harness.h
|
| @@ -17,6 +17,7 @@
|
| #include "sync/internal_api/public/base/model_type.h"
|
|
|
| class Profile;
|
| +class P2PInvalidationService;
|
|
|
| namespace browser_sync {
|
| namespace sessions {
|
| @@ -34,6 +35,7 @@ class ProfileSyncServiceHarness
|
| public browser_sync::MigrationObserver {
|
| public:
|
| ProfileSyncServiceHarness(Profile* profile,
|
| + P2PInvalidationService* invalidation_service,
|
| const std::string& username,
|
| const std::string& password);
|
|
|
| @@ -42,7 +44,9 @@ class ProfileSyncServiceHarness
|
| // Creates a ProfileSyncServiceHarness object and attaches it to |profile|, a
|
| // profile that is assumed to have been signed into sync in the past. Caller
|
| // takes ownership.
|
| - static ProfileSyncServiceHarness* CreateAndAttach(Profile* profile);
|
| + static ProfileSyncServiceHarness* CreateAndAttach(
|
| + Profile* profile,
|
| + P2PInvalidationService* p2p_invalidation_service);
|
|
|
| // Sets the GAIA credentials with which to sign in to sync.
|
| void SetCredentials(const std::string& username, const std::string& password);
|
| @@ -62,6 +66,7 @@ class ProfileSyncServiceHarness
|
|
|
| // ProfileSyncServiceObserver implementation.
|
| virtual void OnStateChanged() OVERRIDE;
|
| + virtual void OnSyncCycleCompleted() OVERRIDE;
|
|
|
| // MigrationObserver implementation.
|
| virtual void OnMigrationStateChange() OVERRIDE;
|
| @@ -339,6 +344,9 @@ class ProfileSyncServiceHarness
|
| // ProfileSyncService object associated with |profile_|.
|
| ProfileSyncService* service_;
|
|
|
| + // P2PInvalidationService associated with |profile_|.
|
| + P2PInvalidationService* p2p_invalidation_service_;
|
| +
|
| // The harness of the client whose update progress marker we're expecting
|
| // eventually match.
|
| ProfileSyncServiceHarness* progress_marker_partner_;
|
|
|