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

chrome/browser/extensions/extension_garbage_collector_factory.cc

 // Copyright 2014 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/extension_garbage_collector_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/extension_garbage_collector.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
@@ skipping 24 matching lines @@
     : BrowserContextKeyedServiceFactory(
           "ExtensionGarbageCollector",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   DependsOn(InstallTrackerFactory::GetInstance());
 }
 
 ExtensionGarbageCollectorFactory::~ExtensionGarbageCollectorFactory() {}
 
 // static
-KeyedService* ExtensionGarbageCollectorFactory::BuildInstanceFor(
+scoped_ptr<KeyedService> ExtensionGarbageCollectorFactory::BuildInstanceFor(
     content::BrowserContext* context) {
 #if defined(OS_CHROMEOS)
-  return new ExtensionGarbageCollectorChromeOS(context);
+  return make_scoped_ptr(new ExtensionGarbageCollectorChromeOS(context));
 #else
-  return new ExtensionGarbageCollector(context);
+  return make_scoped_ptr(new ExtensionGarbageCollector(context));
 #endif
 }
 
 KeyedService* ExtensionGarbageCollectorFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return BuildInstanceFor(context);
+  return BuildInstanceFor(context).release();
 }
 
 bool ExtensionGarbageCollectorFactory::ServiceIsCreatedWithBrowserContext()
     const {
   return true;
 }
 
 bool ExtensionGarbageCollectorFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 }  // namespace extensions