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

chrome/browser/ui/views/frame/test_with_browser_view.cc

 // Copyright 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/ui/views/frame/test_with_browser_view.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 13 matching lines @@
 #include "components/search_engines/template_url_service.h"
 #include "content/public/test/test_utils.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #endif
 
 namespace {
 
-// Caller owns the returned service.
-KeyedService* CreateTemplateURLService(content::BrowserContext* context) {
+scoped_ptr<KeyedService> 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>(new ChromeTemplateURLServiceClient(
           HistoryServiceFactory::GetForProfile(
               profile, ServiceAccessType::EXPLICIT_ACCESS))),
-      nullptr, nullptr, base::Closure());
+      nullptr, nullptr, base::Closure()));
 }
 
-KeyedService* CreateAutocompleteClassifier(content::BrowserContext* context) {
+scoped_ptr<KeyedService> CreateAutocompleteClassifier(
+    content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
-  return new AutocompleteClassifier(
+  return make_scoped_ptr(new AutocompleteClassifier(
       make_scoped_ptr(new AutocompleteController(
           profile, TemplateURLServiceFactory::GetForProfile(profile), nullptr,
           AutocompleteClassifier::kDefaultOmniboxProviders)),
-      scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier()));
+      scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier())));
 }
 
 }  // namespace
 
 TestWithBrowserView::TestWithBrowserView() {
 }
 
 TestWithBrowserView::TestWithBrowserView(
     Browser::Type browser_type,
     chrome::HostDesktopType host_desktop_type,
@@ skipping 51 matching lines @@
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactory(
       profile, &CreateAutocompleteClassifier);
   return profile;
 }
 
 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() {
   // Allow BrowserWithTestWindowTest to use Browser to create the default
   // BrowserView and BrowserFrame.
   return nullptr;
 }