Index: chrome/browser/extensions/api/instance_id/instance_id_apitest.cc |
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc |
index 646fab0801762c2a178b8996ef74c1653ff0005e..2709a73bfbfe860fc7e50ba4a7cb14e59c75ba7b 100644 |
--- a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc |
+++ b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc |
@@ -2,11 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include <memory> |
#include <utility> |
#include "base/base_switches.h" |
#include "base/macros.h" |
-#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" |
@@ -26,9 +26,9 @@ namespace extensions { |
namespace { |
-scoped_ptr<KeyedService> BuildFakeGCMProfileService( |
+std::unique_ptr<KeyedService> BuildFakeGCMProfileService( |
content::BrowserContext* context) { |
- scoped_ptr<gcm::FakeGCMProfileService> service( |
+ std::unique_ptr<gcm::FakeGCMProfileService> service( |
new gcm::FakeGCMProfileService(Profile::FromBrowserContext(context))); |
service->SetDriverForTesting(new instance_id::FakeGCMDriverForInstanceID()); |
return std::move(service); |