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

components/keyed_service/core/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/core/keyed_service_factory.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 #include "components/keyed_service/core/dependency_manager.h"
@@ skipping 59 matching lines @@
   if (it != mapping_.end())
     return it->second;
 
   // Object not found.
   if (!create)
     return nullptr;  // And we're forbidden from creating one.
 
   // Create new object.
   // Check to see if we have a per-context testing factory that we should use
   // instead of default behavior.
-  KeyedService* service = nullptr;
+  scoped_ptr<KeyedService> service;
   const auto& jt = testing_factories_.find(context);
   if (jt != testing_factories_.end()) {
     if (jt->second) {
       if (!IsOffTheRecord(context))
         RegisterUserPrefsOnContextForTest(context);
       service = jt->second(context);
     }
   } else {
     service = BuildServiceInstanceFor(context);
   }
 
-  Associate(context, service);
-  return service;
+  Associate(context, service.Pass());
+  return mapping_[context];
 }
 
 void KeyedServiceFactory::Associate(base::SupportsUserData* context,
-                                    KeyedService* service) {
+                                    scoped_ptr<KeyedService> service) {
   DCHECK(!ContainsKey(mapping_, context));
-  mapping_.insert(std::make_pair(context, service));
+  mapping_.insert(std::make_pair(context, service.release()));
 }
 
 void KeyedServiceFactory::Disassociate(base::SupportsUserData* context) {
   const auto& it = mapping_.find(context);
   if (it != mapping_.end()) {
     delete it->second;
     mapping_.erase(it);
   }
 }
 
@@ skipping 20 matching lines @@
   SetTestingFactory(context, nullptr);
 }
 
 bool KeyedServiceFactory::HasTestingFactory(base::SupportsUserData* context) {
   return testing_factories_.find(context) != testing_factories_.end();
 }
 
 void KeyedServiceFactory::CreateServiceNow(base::SupportsUserData* context) {
   GetServiceForContext(context, true);
 }