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

extensions/browser/api/storage/storage_api_unittest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/test/test_browser_context.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
 #include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
 #include "extensions/browser/api/storage/settings_test_util.h"
 #include "extensions/browser/api/storage/storage_api.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
 #include "extensions/browser/api_unittest.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/event_router_factory.h"
 #include "extensions/browser/test_extensions_browser_client.h"
 #include "extensions/browser/value_store/leveldb_value_store.h"
 #include "extensions/browser/value_store/value_store.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/test_util.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 namespace extensions {
 
 namespace {
 
 // Caller owns the returned object.
-KeyedService* CreateStorageFrontendForTesting(
+scoped_ptr<KeyedService> CreateStorageFrontendForTesting(
     content::BrowserContext* context) {
   return StorageFrontend::CreateForTesting(new LeveldbSettingsStorageFactory(),
                                            context);
 }
 
-KeyedService* BuildEventRouter(content::BrowserContext* profile) {
-  return new extensions::EventRouter(profile, nullptr);
+scoped_ptr<KeyedService> BuildEventRouter(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 extensions::EventRouter(profile, nullptr));
 }
 
 }  // namespace
 
 class StorageApiUnittest : public ApiUnitTest {
  public:
   StorageApiUnittest() {}
   ~StorageApiUnittest() override {}
 
  protected:
@@ skipping 63 matching lines @@
   EXPECT_TRUE(leveldb_store->Get(kKey)->IsCorrupted());
 
   // Running another set should end up working (even though it will restore the
   // store behind the scenes).
   RunSetFunction(kKey, kValue);
   EXPECT_TRUE(RunGetFunction(kKey, &result));
   EXPECT_EQ(kValue, result);
 }
 
 }  // namespace extensions