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

chrome/browser/extensions/extension_action_test_util.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/extensions/extension_action_test_util.h"
 
+#include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_toolbar_model_factory.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ skipping 45 matching lines @@
       if (extension_action &&
           (!only_count_visible || extension_action->GetIsVisible(tab_id)))
         ++count;
     }
   }
 
   return count;
 }
 
 // Creates a new ExtensionToolbarModel for the given |context|.
-KeyedService* BuildToolbarModel(content::BrowserContext* context) {
-  return new extensions::ExtensionToolbarModel(
+scoped_ptr<KeyedService> BuildToolbarModel(content::BrowserContext* context) {
+  return make_scoped_ptr(new extensions::ExtensionToolbarModel(
       Profile::FromBrowserContext(context),
-      extensions::ExtensionPrefs::Get(context));
+      extensions::ExtensionPrefs::Get(context)));
 }
 
 // Creates a new ExtensionToolbarModel for the given profile, optionally
 // triggering the extension system's ready signal.
 ExtensionToolbarModel* CreateToolbarModelImpl(Profile* profile,
                                               bool wait_for_ready) {
   ExtensionToolbarModel* model = ExtensionToolbarModel::Get(profile);
   if (model)
     return model;
 
@@ skipping 68 matching lines @@
   return CreateToolbarModelImpl(profile, true);
 }
 
 ExtensionToolbarModel* CreateToolbarModelForProfileWithoutWaitingForReady(
     Profile* profile) {
   return CreateToolbarModelImpl(profile, false);
 }
 
 }  // namespace extension_action_test_util
 }  // namespace extensions