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

components/keyed_service/ios/browser_state_keyed_service_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 "components/keyed_service/ios/browser_state_keyed_service_factory.h"
 
 #include "base/logging.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/keyed_service/ios/browser_state_context_converter.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
@@ skipping 56 matching lines @@
 void BrowserStateKeyedServiceFactory::BrowserStateShutdown(
     web::BrowserState* context) {
   KeyedServiceFactory::ContextShutdown(context);
 }
 
 void BrowserStateKeyedServiceFactory::BrowserStateDestroyed(
     web::BrowserState* context) {
   KeyedServiceFactory::ContextDestroyed(context);
 }
 
-KeyedService* BrowserStateKeyedServiceFactory::BuildServiceInstanceFor(
+scoped_ptr<KeyedService>
+BrowserStateKeyedServiceFactory::BuildServiceInstanceFor(
     base::SupportsUserData* context) const {
-  return BuildServiceInstanceFor(static_cast<web::BrowserState*>(context));
+  // TODO(isherman): The wrapped BuildServiceInstanceFor() should return a
+  // scoped_ptr as well.
+  return make_scoped_ptr(
+      BuildServiceInstanceFor(static_cast<web::BrowserState*>(context)));
 }
 
 bool BrowserStateKeyedServiceFactory::IsOffTheRecord(
     base::SupportsUserData* context) const {
   return static_cast<web::BrowserState*>(context)->IsOffTheRecord();
 }
 
 #if defined(OS_IOS)
 base::SupportsUserData* BrowserStateKeyedServiceFactory::GetTypedContext(
     base::SupportsUserData* context) const {
@@ skipping 39 matching lines @@
 
 void BrowserStateKeyedServiceFactory::ContextDestroyed(
     base::SupportsUserData* context) {
   BrowserStateDestroyed(static_cast<web::BrowserState*>(context));
 }
 
 void BrowserStateKeyedServiceFactory::RegisterPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   RegisterBrowserStatePrefs(registry);
 }