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

chrome/browser/profile_resetter/profile_resetter_unittest.cc

 // Copyright (c) 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/profile_resetter/profile_resetter.h"
 
 #include "base/json/json_string_value_serializer.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
@@ skipping 82 matching lines @@
                             public ProfileResetterTestBase {
  public:
   ProfileResetterTest();
   ~ProfileResetterTest() override;
 
  protected:
   void SetUp() override;
 
   TestingProfile* profile() { return profile_.get(); }
 
-  static KeyedService* CreateTemplateURLService(
+  static scoped_ptr<KeyedService> CreateTemplateURLService(
       content::BrowserContext* context);
 
  private:
 #if defined(OS_WIN)
   base::ScopedPathOverride user_desktop_override_;
   base::ScopedPathOverride app_dir_override_;
   base::ScopedPathOverride start_menu_override_;
   base::ScopedPathOverride taskbar_pins_override_;
   base::win::ScopedCOMInitializer com_init_;
 #endif
@@ skipping 16 matching lines @@
   InitializeEmptyExtensionService();
 
   profile()->CreateWebDataService();
   TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
       profile(),
       &ProfileResetterTest::CreateTemplateURLService);
   resetter_.reset(new ProfileResetter(profile()));
 }
 
 // static
-KeyedService* ProfileResetterTest::CreateTemplateURLService(
+scoped_ptr<KeyedService> ProfileResetterTest::CreateTemplateURLService(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
-  return new TemplateURLService(
+  return make_scoped_ptr(new TemplateURLService(
       profile->GetPrefs(),
       scoped_ptr<SearchTermsData>(new UIThreadSearchTermsData(profile)),
       WebDataServiceFactory::GetKeywordWebDataForProfile(
           profile, ServiceAccessType::EXPLICIT_ACCESS),
-      scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure());
+      scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure()));
 }
 
 
 // PinnedTabsResetTest --------------------------------------------------------
 
 class PinnedTabsResetTest : public BrowserWithTestWindowTest,
                             public ProfileResetterTestBase {
  protected:
   void SetUp() override;
 
@@ skipping 906 matching lines @@
       new ResettableSettingsSnapshot(profile()));
   deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
                                                 base::Unretained(&capture)));
   deleted_snapshot.reset();
   // Running remaining tasks shouldn't trigger the callback to be called as
   // |deleted_snapshot| was deleted before it could run.
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace