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

chrome/browser/invalidation/profile_invalidation_provider_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/invalidation/profile_invalidation_provider_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
@@ skipping 74 matching lines @@
 }
 
 ProfileInvalidationProviderFactory::~ProfileInvalidationProviderFactory() {
 }
 
 void ProfileInvalidationProviderFactory::RegisterTestingFactory(
     TestingFactoryFunction testing_factory) {
   testing_factory_ = testing_factory;
 }
 
 KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(

[sky, 2015/06/08 20:18:49]

It seems weird not to change this too. Is there a reason you didn't want to
update BuildServiceInfanceFor to return a scoped_ptr too?

[Ilya Sherman, 2015/06/08 22:11:43]

I'd like to change it, but would prefer to punt that to a separate CL (which
might take a while to author).  Note that this method is overridden from
BrowserContextKeyedServiceFactory.  There are roughly 400 files that override
the same method, so I figured that it made sense to transition the API over one
step at a time.

     content::BrowserContext* context) const {
   if (testing_factory_)
-    return testing_factory_(context);
+    return testing_factory_(context).release();
 
 #if defined(OS_ANDROID)
   return new ProfileInvalidationProvider(scoped_ptr<InvalidationService>(
       new InvalidationServiceAndroid(base::android::GetApplicationContext())));
 #else
 
   scoped_ptr<IdentityProvider> identity_provider;
 
 #if defined(OS_CHROMEOS)
   policy::BrowserPolicyConnectorChromeOS* connector =
@@ skipping 30 matching lines @@
 
 void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kInvalidationServiceUseGCMChannel,
       true);  // if no value in prefs, use GCM channel.
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }
 
 }  // namespace invalidation