Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: components/keyed_service/core/keyed_service_factory.h

Issue 1918083002: Convert //components/[f-n]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/keyed_service/core/keyed_service_factory.h
diff --git a/components/keyed_service/core/keyed_service_factory.h b/components/keyed_service/core/keyed_service_factory.h
index 1374a25e323cf7ee43b6247968248a9412b82af2..a4837abf37901e123a5fe4a838218203aa951173 100644
--- a/components/keyed_service/core/keyed_service_factory.h
+++ b/components/keyed_service/core/keyed_service_factory.h
@@ -6,11 +6,11 @@
#define COMPONENTS_KEYED_SERVICE_CORE_KEYED_SERVICE_FACTORY_H_
#include <map>
+#include <memory>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/keyed_service/core/keyed_service_base_factory.h"
#include "components/keyed_service/core/keyed_service_export.h"
@@ -33,7 +33,7 @@ class KEYED_SERVICE_EXPORT KeyedServiceFactory
// A function that supplies the instance of a KeyedService for a given
// |context|. This is used primarily for testing, where we want to feed
// a specific mock into the KeyedServiceFactory system.
- typedef scoped_ptr<KeyedService>(*TestingFactoryFunction)(
+ typedef std::unique_ptr<KeyedService> (*TestingFactoryFunction)(
danakj 2016/04/26 01:40:16 using if u want
dcheng 2016/04/26 03:55:46 done.
base::SupportsUserData* context);
// Associates |factory| with |context| so that |factory| is used to create
@@ -58,13 +58,13 @@ class KEYED_SERVICE_EXPORT KeyedServiceFactory
// Maps |context| to |service| with debug checks to prevent duplication.
void Associate(base::SupportsUserData* context,
- scoped_ptr<KeyedService> service);
+ std::unique_ptr<KeyedService> service);
// Removes the mapping from |context| to a service.
void Disassociate(base::SupportsUserData* context);
// Returns a new KeyedService that will be associated with |context|.
- virtual scoped_ptr<KeyedService> BuildServiceInstanceFor(
+ virtual std::unique_ptr<KeyedService> BuildServiceInstanceFor(
base::SupportsUserData* context) const = 0;
// Returns whether the |context| is off-the-record or not.

Powered by Google App Engine
This is Rietveld 408576698