| Index: chrome/browser/sync/test/integration/profile_sync_service_harness.h
|
| diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.h b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
|
| index 42ca64008d2115528b34777171673509643ed9e6..777f99cbdde32828832e2e08794b959c6fae9f88 100644
|
| --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.h
|
| +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
|
| @@ -39,7 +39,7 @@ class ProfileSyncServiceHarness {
|
| UI_SIGNIN
|
| };
|
|
|
| - static ProfileSyncServiceHarness* Create(
|
| + static std::unique_ptr<ProfileSyncServiceHarness> Create(
|
| Profile* profile,
|
| const std::string& username,
|
| const std::string& password,
|
| @@ -85,14 +85,13 @@ class ProfileSyncServiceHarness {
|
| // Note: Use this method when exactly one client makes local change(s),
|
| // and more than one client is waiting to receive those changes.
|
| bool AwaitGroupSyncCycleCompletion(
|
| - const std::vector<ProfileSyncServiceHarness*>& partners);
|
| + std::vector<ProfileSyncServiceHarness*> partners);
|
|
|
| // Blocks the caller until every client in |clients| completes its ongoing
|
| // sync cycle and all the clients' progress markers match. Note: Use this
|
| // method when more than one client makes local change(s), and more than one
|
| // client is waiting to receive those changes.
|
| - static bool AwaitQuiescence(
|
| - const std::vector<ProfileSyncServiceHarness*>& clients);
|
| + static bool AwaitQuiescence(std::vector<ProfileSyncServiceHarness*> clients);
|
|
|
| // Blocks the caller until the sync engine is initialized or some end state
|
| // (e.g., auth error) is reached. Returns true if and only if the engine
|
|
|