| Index: chrome/browser/sync/test/integration/sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
|
| index 0f3176f941ca1a65eb892e00f31566ffda1bbb74..f58ba61830a02d37991745a4749c6a752e9c254d 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_test.cc
|
| @@ -176,16 +176,16 @@ class EncryptionChecker : public SingleClientStatusChangeChecker {
|
|
|
| std::unique_ptr<KeyedService> BuildFakeServerProfileInvalidationProvider(
|
| content::BrowserContext* context) {
|
| - return base::WrapUnique(new invalidation::ProfileInvalidationProvider(
|
| + return base::MakeUnique<invalidation::ProfileInvalidationProvider>(
|
| std::unique_ptr<invalidation::InvalidationService>(
|
| - new fake_server::FakeServerInvalidationService)));
|
| + new fake_server::FakeServerInvalidationService));
|
| }
|
|
|
| std::unique_ptr<KeyedService> BuildP2PProfileInvalidationProvider(
|
| content::BrowserContext* context,
|
| syncer::P2PNotificationTarget notification_target) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| - return base::WrapUnique(new invalidation::ProfileInvalidationProvider(
|
| + return base::MakeUnique<invalidation::ProfileInvalidationProvider>(
|
| std::unique_ptr<invalidation::InvalidationService>(
|
| new invalidation::P2PInvalidationService(
|
| std::unique_ptr<IdentityProvider>(new ProfileIdentityProvider(
|
| @@ -193,7 +193,7 @@ std::unique_ptr<KeyedService> BuildP2PProfileInvalidationProvider(
|
| ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
|
| LoginUIServiceFactory::GetShowLoginPopupCallbackForProfile(
|
| profile))),
|
| - profile->GetRequestContext(), notification_target))));
|
| + profile->GetRequestContext(), notification_target)));
|
| }
|
|
|
| std::unique_ptr<KeyedService> BuildSelfNotifyingP2PProfileInvalidationProvider(
|
|
|