| Index: sync/internal_api/public/base/model_type.h
|
| diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
|
| index 5e3308456ec2d38f632d7071f1cc105d1a9e79f7..8e90c90225aebbba272a7a64374e154f6e12a68d 100644
|
| --- a/sync/internal_api/public/base/model_type.h
|
| +++ b/sync/internal_api/public/base/model_type.h
|
| @@ -10,11 +10,11 @@
|
| #define SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "sync/base/sync_export.h"
|
| #include "sync/internal_api/public/base/enum_set.h"
|
|
|
| @@ -300,7 +300,7 @@ SYNC_EXPORT std::string ModelTypeSetToString(ModelTypeSet model_types);
|
| SYNC_EXPORT ModelTypeSet ModelTypeSetFromString(
|
| const std::string& model_type_string);
|
|
|
| -SYNC_EXPORT scoped_ptr<base::ListValue> ModelTypeSetToValue(
|
| +SYNC_EXPORT std::unique_ptr<base::ListValue> ModelTypeSetToValue(
|
| ModelTypeSet model_types);
|
|
|
| SYNC_EXPORT ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value);
|
|
|