| Index: base/memory/scoped_ptr.h
|
| diff --git a/base/memory/scoped_ptr.h b/base/memory/scoped_ptr.h
|
| index 358e9f18c53761ae5e3b2186d6ef84eccef46259..038f84af9ad7eec1b14363cf0933fd75e38037b1 100644
|
| --- a/base/memory/scoped_ptr.h
|
| +++ b/base/memory/scoped_ptr.h
|
| @@ -123,7 +123,7 @@ struct FreeDeleter {
|
| // Now that scoped_ptr is almost 100% compatible with std::unique_ptr, we're
|
| // incrementally migrating scoped_ptr to just be a type alias for
|
| // std::unique_ptr. The eventual goal is to delete scoped_ptr altogether.
|
| -#if defined(OS_LINUX) || defined(OS_WIN)
|
| +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_ANDROID)
|
| template <typename T, typename D = std::default_delete<T>>
|
| using scoped_ptr = std::unique_ptr<T, D>;
|
|
|
|
|