| Index: ui/gl/gpu_timing.h
|
| diff --git a/ui/gl/gpu_timing.h b/ui/gl/gpu_timing.h
|
| index d17dd5dbe76cfe1d53355584426a25d02ce4e7d6..b7f7d0b95121b805889063f9415f74e7bc8d0b94 100644
|
| --- a/ui/gl/gpu_timing.h
|
| +++ b/ui/gl/gpu_timing.h
|
| @@ -12,7 +12,6 @@
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gl/gl_export.h"
|
|
|
| // The gpu_timing classes handles the abstraction of GL GPU Timing extensions
|
| @@ -129,7 +128,7 @@ class GL_EXPORT GPUTimingClient
|
| public:
|
| explicit GPUTimingClient(GPUTimingImpl* gpu_timing = nullptr);
|
|
|
| - scoped_ptr<GPUTimer> CreateGPUTimer(bool prefer_elapsed_time);
|
| + std::unique_ptr<GPUTimer> CreateGPUTimer(bool prefer_elapsed_time);
|
| bool IsAvailable();
|
|
|
| const char* GetTimerTypeName() const;
|
|
|