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

chrome/browser/extensions/api/instance_id/instance_id_apitest.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 "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/instance_id/instance_id_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
 #include "extensions/test/result_catcher.h"
 
 using extensions::ResultCatcher;
 
 namespace extensions {
 
 namespace {
 
-KeyedService* BuildFakeGCMProfileService(content::BrowserContext* context) {
-  gcm::FakeGCMProfileService* service =
-      new gcm::FakeGCMProfileService(Profile::FromBrowserContext(context));
+scoped_ptr<KeyedService> BuildFakeGCMProfileService(
+    content::BrowserContext* context) {
+  scoped_ptr<gcm::FakeGCMProfileService> service(
+      new gcm::FakeGCMProfileService(Profile::FromBrowserContext(context)));
   service->SetDriverForTesting(new instance_id::FakeGCMDriverForInstanceID());
-  return service;
+  return service.Pass();
 }
 
 }  // namespace
 
 class InstanceIDApiTest : public ExtensionApiTest {
  public:
   InstanceIDApiTest();
 
  protected:
   void SetUpOnMainThread() override;
@@ skipping 63 matching lines @@
   ASSERT_TRUE(RunExtensionTest("instance_id/channel"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstanceIDApiTest, StableChannel) {
   extensions::ScopedCurrentChannel current_channel_override(
       chrome::VersionInfo::CHANNEL_STABLE);
   ASSERT_TRUE(RunExtensionTest("instance_id/channel"));
 }
 
 }  // namespace extensions