Index: chrome/browser/extensions/api/sessions/sessions_apitest.cc |
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc |
index 36c02d59bb150a365081f744d57a1e5e639bfe27..f85f47978c21b53acf9d971ab963399e04a4203c 100644 |
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc |
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc |
@@ -90,7 +90,7 @@ class ExtensionSessionsTest : public InProcessBrowserTest { |
void SetUpOnMainThread() override; |
protected: |
- static KeyedService* BuildProfileSyncService( |
+ static scoped_ptr<KeyedService> BuildProfileSyncService( |
content::BrowserContext* profile); |
void CreateTestProfileSyncService(); |
@@ -121,11 +121,10 @@ void ExtensionSessionsTest::SetUpOnMainThread() { |
CreateTestExtension(); |
} |
-KeyedService* ExtensionSessionsTest::BuildProfileSyncService( |
- content::BrowserContext* profile) { |
- |
- ProfileSyncComponentsFactoryMock* factory = |
- new ProfileSyncComponentsFactoryMock(); |
+scoped_ptr<KeyedService> ExtensionSessionsTest::BuildProfileSyncService( |
+ content::BrowserContext* context) { |
+ scoped_ptr<ProfileSyncComponentsFactoryMock> factory( |
+ new ProfileSyncComponentsFactoryMock()); |
factory->SetLocalDeviceInfoProvider( |
scoped_ptr<sync_driver::LocalDeviceInfoProvider>( |
@@ -137,9 +136,8 @@ KeyedService* ExtensionSessionsTest::BuildProfileSyncService( |
sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
"device_id"))); |
- return new ProfileSyncServiceMock( |
- scoped_ptr<ProfileSyncComponentsFactory>(factory), |
- static_cast<Profile*>(profile)); |
+ return make_scoped_ptr(new ProfileSyncServiceMock( |
+ factory.Pass(), static_cast<Profile*>(context))); |
} |
void ExtensionSessionsTest::CreateTestProfileSyncService() { |