| Index: gpu/command_buffer/service/query_manager.h
|
| diff --git a/gpu/command_buffer/service/query_manager.h b/gpu/command_buffer/service/query_manager.h
|
| index f9f6816a23d07d38cd8bbde0f4efca6b9a2e38e8..f09339b0f96005143599f1b063105e8cf66192ae 100644
|
| --- a/gpu/command_buffer/service/query_manager.h
|
| +++ b/gpu/command_buffer/service/query_manager.h
|
| @@ -8,13 +8,14 @@
|
| #include <stdint.h>
|
|
|
| #include <deque>
|
| +#include <memory>
|
| #include <vector>
|
| +
|
| #include "base/atomicops.h"
|
| #include "base/containers/hash_tables.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "gpu/command_buffer/service/feature_info.h"
|
| #include "gpu/gpu_export.h"
|
|
|
| @@ -261,7 +262,7 @@ class GPU_EXPORT QueryManager {
|
| return decoder_;
|
| }
|
|
|
| - scoped_ptr<gfx::GPUTimer> CreateGPUTimer(bool elapsed_time);
|
| + std::unique_ptr<gfx::GPUTimer> CreateGPUTimer(bool elapsed_time);
|
| bool GPUTimingAvailable();
|
|
|
| void GenQueries(GLsizei n, const GLuint* queries);
|
|
|