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

chrome/browser/extensions/api/audio_modem/audio_modem_api_unittest.cc

 // Copyright 2015 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 <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 29 matching lines @@
 namespace extensions {
 
 namespace {
 
 // The TestingFactoryFunction uses a BrowserContext as its context pointer.
 // But each BrowserContext is still associated with a unit test.
 // So we store the StubModem created in each test.
 std::map<BrowserContext*, StubModem*> g_modems;
 
 // Create a test AudioModemAPI and store the modem it uses.
-KeyedService* ApiFactoryFunction(BrowserContext* context) {
+scoped_ptr<KeyedService> ApiFactoryFunction(BrowserContext* context) {
   StubModem* modem = new StubModem;
   g_modems[context] = modem;
-  return new AudioModemAPI(
+  return make_scoped_ptr(new AudioModemAPI(
       context,
       make_scoped_ptr<audio_modem::WhispernetClient>(new StubWhispernetClient),
-      make_scoped_ptr<audio_modem::Modem>(modem));
+      make_scoped_ptr<audio_modem::Modem>(modem)));
 }
 
 DictionaryValue* CreateParams(const std::string& audio_band) {
   DictionaryValue* params = new DictionaryValue;
   params->SetInteger("timeoutMillis", 60000);
   params->SetString("band", audio_band);
   params->SetInteger("encoding.tokenLength", 4);
   return params;
 }
 
@@ skipping 57 matching lines @@
 
   void ClearEventCallback() {
     event_callback_.Reset();
   }
 
  private:
   EventCallback event_callback_;
 };
 
 // StubEventRouter factory function
-KeyedService* StubEventRouterFactoryFunction(content::BrowserContext* context) {
-  return new StubEventRouter(context);
+scoped_ptr<KeyedService> StubEventRouterFactoryFunction(
+    content::BrowserContext* context) {
+  return make_scoped_ptr(new StubEventRouter(context));
 }
 
 }  // namespace
 
 class AudioModemApiUnittest : public ExtensionApiUnittest {
  public:
   AudioModemApiUnittest() {}
   ~AudioModemApiUnittest() override {
     for (const auto& events : events_by_extension_id_) {
       for (const Event* event : events.second)
@@ skipping 231 matching lines @@
   expected_token.reset(CreateReceivedToken("1234", "inaudible"));
   EXPECT_TRUE(ReceivedSingleToken(
       GetEventsForExtension("ext2")[1], expected_token.get()));
 
   EXPECT_EQ("success", RunFunction<AudioModemStopReceiveFunction>(
       CreateList(new StringValue("inaudible")), GetExtension("ext2")));
   EXPECT_FALSE(GetModem()->IsRecording(INAUDIBLE));
 }
 
 }  // namespace extensions