| Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| index b4a2863defb6b45956014aa47dc41cbf53f1543f..da822513e9e0e6274a6f37431bf3c2ef366cca73 100644
|
| --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/pref_registry.h"
|
| #include "build/build_config.h"
|
| @@ -125,7 +127,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
|
| }
|
|
|
| scoped_ptr<TiclInvalidationService> service(new TiclInvalidationService(
|
| - GetUserAgent(), identity_provider.Pass(),
|
| + GetUserAgent(), std::move(identity_provider),
|
| scoped_ptr<TiclSettingsProvider>(
|
| new TiclProfileSettingsProvider(profile->GetPrefs())),
|
| gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
|
| @@ -133,7 +135,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
|
| service->Init(scoped_ptr<syncer::InvalidationStateTracker>(
|
| new InvalidatorStorage(profile->GetPrefs())));
|
|
|
| - return new ProfileInvalidationProvider(service.Pass());
|
| + return new ProfileInvalidationProvider(std::move(service));
|
| #endif
|
| }
|
|
|
|
|