[Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions.

chrome/browser/extensions/api/sessions/sessions_apitest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/sessions/sessions_api.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
@@ skipping 72 matching lines @@
   navigation->set_title("MyTitle");
   navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
 }
 
 class ExtensionSessionsTest : public InProcessBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
 
  protected:
-  static KeyedService* BuildProfileSyncService(
+  static scoped_ptr<KeyedService> BuildProfileSyncService(
       content::BrowserContext* profile);
 
   void CreateTestProfileSyncService();
   void CreateTestExtension();
   void CreateSessionModels();
 
   template <class T>
   scoped_refptr<T> CreateFunction(bool has_callback) {
     scoped_refptr<T> fn(new T());
     fn->set_extension(extension_.get());
@@ skipping 10 matching lines @@
   command_line->AppendSwitch(
       chromeos::switches::kIgnoreUserProfileMappingForTests);
 #endif
 }
 
 void ExtensionSessionsTest::SetUpOnMainThread() {
   CreateTestProfileSyncService();
   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>(
           new sync_driver::LocalDeviceInfoProviderMock(
               kSessionTags[0],
               "machine name",
               "Chromium 10k",
               "Chrome 10k",
               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() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.AppendASCII("test_profile");
   if (!base::PathExists(path))
     CHECK(base::CreateDirectory(path));
   Profile* profile =
@@ skipping 233 matching lines @@
     return;
 #endif
 
   ASSERT_TRUE(RunExtensionSubtest("sessions",
                                   "sessions.html")) << message_;
 }
 
 }  // namespace
 
 }  // namespace extensions