| Index: content/browser/geofencing/geofencing_service.h
|
| diff --git a/content/browser/geofencing/geofencing_service.h b/content/browser/geofencing/geofencing_service.h
|
| index dddbcfb1c706276741812eec523615fb924da980..7685243f9d2901e9c71c7cd66b6f61f356e5cfc3 100644
|
| --- a/content/browser/geofencing/geofencing_service.h
|
| +++ b/content/browser/geofencing/geofencing_service.h
|
| @@ -8,10 +8,10 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/geofencing_types.h"
|
|
|
| @@ -78,7 +78,7 @@ class CONTENT_EXPORT GeofencingServiceImpl
|
| GeofencingServiceImpl();
|
| ~GeofencingServiceImpl() override;
|
|
|
| - void SetProviderForTesting(scoped_ptr<GeofencingProvider> provider);
|
| + void SetProviderForTesting(std::unique_ptr<GeofencingProvider> provider);
|
| int RegistrationCountForTesting();
|
|
|
| private:
|
| @@ -100,7 +100,7 @@ class CONTENT_EXPORT GeofencingServiceImpl
|
|
|
| int64_t next_registration_id_;
|
| RegistrationsMap registrations_;
|
| - scoped_ptr<GeofencingProvider> provider_;
|
| + std::unique_ptr<GeofencingProvider> provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GeofencingServiceImpl);
|
| };
|
|
|