| Index: ppapi/proxy/camera_capabilities_resource.h
|
| diff --git a/ppapi/proxy/camera_capabilities_resource.h b/ppapi/proxy/camera_capabilities_resource.h
|
| index 14431ce16fe7a625770433b8c200493560774df3..ba92d4ae4c428e8d061b245051f04945e760fc50 100644
|
| --- a/ppapi/proxy/camera_capabilities_resource.h
|
| +++ b/ppapi/proxy/camera_capabilities_resource.h
|
| @@ -8,10 +8,10 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ppapi/proxy/ppapi_proxy_export.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| #include "ppapi/thunk/ppb_camera_capabilities_api.h"
|
| @@ -38,7 +38,7 @@ class PPAPI_PROXY_EXPORT CameraCapabilitiesResource
|
|
|
| private:
|
| size_t num_video_capture_formats_;
|
| - scoped_ptr<PP_VideoCaptureFormat[]> video_capture_formats_;
|
| + std::unique_ptr<PP_VideoCaptureFormat[]> video_capture_formats_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CameraCapabilitiesResource);
|
| };
|
|
|