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

chrome/browser/extensions/api/mdns/mdns_api_unittest.cc

Index: chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
index 84e1f086745bdbe36debe084ad9c3a4aac1ead38..e880e00eb3f52059153254e185f452b71cb2e04d 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
@@ -20,14 +21,15 @@ namespace extensions {
 
 namespace {
 
-KeyedService* MDnsAPITestingFactoryFunction(content::BrowserContext* context) {
-  return new MDnsAPI(context);
+scoped_ptr<KeyedService> MDnsAPITestingFactoryFunction(
+    content::BrowserContext* context) {
+  return make_scoped_ptr(new MDnsAPI(context));
 }
 
-KeyedService* BuildEventRouter(content::BrowserContext* profile) {
-  return new extensions::EventRouter(
+scoped_ptr<KeyedService> BuildEventRouter(content::BrowserContext* profile) {

[Devlin, 2015/06/08 19:29:43]

nit: rename |profile| to |browser_context| or |context|.

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

Done.

+  return make_scoped_ptr(new extensions::EventRouter(
       profile,
-      ExtensionPrefsFactory::GetInstance()->GetForBrowserContext((profile)));
+      ExtensionPrefsFactory::GetInstance()->GetForBrowserContext((profile))));

[Devlin, 2015/06/08 19:29:43]

nit: Since you're here, could you update this to be simply
ExtensionPrefs::Get()?

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

Done.

 }
 
 // For ExtensionService interface when it requires a path that is not used.
@@ -93,11 +95,6 @@ class MDnsAPITest : public extensions::ExtensionServiceTestBase {
         .Times(1);
     render_process_host_.reset();
     extensions::ExtensionServiceTestBase::TearDown();
-    MDnsAPI::GetFactoryInstance()->SetTestingFactory(
-        browser_context(),
-        nullptr);
-
-    registry_ = nullptr;
   }
 
   virtual MockDnsSdRegistry* dns_sd_registry() {
@@ -226,10 +223,11 @@ class MockEventRouter : public EventRouter {
   MOCK_METHOD1(BroadcastEventPtr, void(Event* event));
 };
 
-KeyedService* MockEventRouterFactoryFunction(content::BrowserContext* profile) {
-  return new MockEventRouter(
+scoped_ptr<KeyedService> MockEventRouterFactoryFunction(
+    content::BrowserContext* profile) {
+  return make_scoped_ptr(new MockEventRouter(
       profile,
-      ExtensionPrefsFactory::GetInstance()->GetForBrowserContext((profile)));
+      ExtensionPrefsFactory::GetInstance()->GetForBrowserContext((profile))));
 }
 
 class MDnsAPIMaxServicesTest : public MDnsAPITest {