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

chrome/browser/extensions/menu_manager_unittest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/browser/extensions/test_extension_system.h"
@@ skipping 457 matching lines @@
                                  event->restrict_to_browser_context,
                                  event->event_url,
                                  event->user_gesture);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventRouter);
 };
 
 // MockEventRouter factory function
-KeyedService* MockEventRouterFactoryFunction(content::BrowserContext* profile) {
-  return new MockEventRouter(static_cast<Profile*>(profile));
+scoped_ptr<KeyedService> MockEventRouterFactoryFunction(
+    content::BrowserContext* profile) {

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

nit: rename

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

Done.

+  return make_scoped_ptr(new MockEventRouter(static_cast<Profile*>(profile)));
 }
 
 }  // namespace
 
 // Tests the RemoveAll functionality.
 TEST_F(MenuManagerTest, RemoveAll) {
   // Try removing all items for an extension id that doesn't have any items.
   manager_.RemoveAllContextItems(MenuItem::ExtensionKey("CCCC"));
 
   // Add 2 top-level and one child item for extension 1.
@@ skipping 245 matching lines @@
   EXPECT_EQ(4u, manager_.MenuItems(key1)->size());
   EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 
   // Remove all context menu items with incognito true.
   manager_.RemoveAllIncognitoContextItems();
   EXPECT_EQ(2u, manager_.MenuItems(key1)->size());
   EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 }
 
 }  // namespace extensions