| Index: gpu/command_buffer/client/share_group.h
|
| diff --git a/gpu/command_buffer/client/share_group.h b/gpu/command_buffer/client/share_group.h
|
| index 25427e3e12c84ef26be7750dcf8a1e4864c5c3e2..066c6e6266596bf3ac15db0a1ba8b840163afbe0 100644
|
| --- a/gpu/command_buffer/client/share_group.h
|
| +++ b/gpu/command_buffer/client/share_group.h
|
| @@ -7,8 +7,10 @@
|
|
|
| #include <GLES2/gl2.h>
|
| #include <stdint.h>
|
| +
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "gles2_impl_export.h"
|
| #include "gpu/command_buffer/client/ref_counted.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| @@ -152,10 +154,11 @@ class GLES2_IMPL_EXPORT ShareGroup
|
| // Install a new program info manager. Used for testing only;
|
| void set_program_info_manager(ProgramInfoManager* manager);
|
|
|
| - scoped_ptr<IdHandlerInterface> id_handlers_[id_namespaces::kNumIdNamespaces];
|
| - scoped_ptr<RangeIdHandlerInterface>
|
| + std::unique_ptr<IdHandlerInterface>
|
| + id_handlers_[id_namespaces::kNumIdNamespaces];
|
| + std::unique_ptr<RangeIdHandlerInterface>
|
| range_id_handlers_[id_namespaces::kNumRangeIdNamespaces];
|
| - scoped_ptr<ProgramInfoManager> program_info_manager_;
|
| + std::unique_ptr<ProgramInfoManager> program_info_manager_;
|
|
|
| bool bind_generates_resource_;
|
| uint64_t tracing_guid_;
|
|
|