| Index: components/sync_driver/sync_service.h
|
| diff --git a/components/sync_driver/sync_service.h b/components/sync_driver/sync_service.h
|
| index b04998b418a316cd1729bf13318b54daadd81f90..4ca8b42e870f5ea9939a74acd6d0cd43f8746cdd 100644
|
| --- a/components/sync_driver/sync_service.h
|
| +++ b/components/sync_driver/sync_service.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef COMPONENTS_SYNC_DRIVER_SYNC_SERVICE_H_
|
| #define COMPONENTS_SYNC_DRIVER_SYNC_SERVICE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/location.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "components/sync_driver/data_type_encryption_handler.h"
|
| @@ -321,7 +321,8 @@ class SyncService : public DataTypeEncryptionHandler {
|
| // For safety, the callback should be bound to some sort of WeakPtr<> or
|
| // scoped_refptr<>.
|
| virtual void GetAllNodes(
|
| - const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) = 0;
|
| + const base::Callback<void(std::unique_ptr<base::ListValue>)>&
|
| + callback) = 0;
|
|
|
| protected:
|
| SyncService() {}
|
|
|