| Index: ui/gl/gpu_timing.cc
|
| diff --git a/ui/gl/gpu_timing.cc b/ui/gl/gpu_timing.cc
|
| index f5d9ae0da4e506263af510fb379b97c2bb6074d6..abe39925f850bd27369535e17de94c7d75b8ae26 100644
|
| --- a/ui/gl/gpu_timing.cc
|
| +++ b/ui/gl/gpu_timing.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ui/gl/gpu_timing.h"
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/time/time.h"
|
| #include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_context.h"
|
| @@ -604,12 +605,13 @@ GPUTimingClient::GPUTimingClient(GPUTimingImpl* gpu_timing)
|
| }
|
| }
|
|
|
| -scoped_ptr<GPUTimer> GPUTimingClient::CreateGPUTimer(bool prefer_elapsed_time) {
|
| +std::unique_ptr<GPUTimer> GPUTimingClient::CreateGPUTimer(
|
| + bool prefer_elapsed_time) {
|
| prefer_elapsed_time |= (timer_type_ == GPUTiming::kTimerTypeEXT);
|
| if (gpu_timing_)
|
| prefer_elapsed_time |= gpu_timing_->IsForceTimeElapsedQuery();
|
|
|
| - return make_scoped_ptr(new GPUTimer(this, prefer_elapsed_time));
|
| + return base::WrapUnique(new GPUTimer(this, prefer_elapsed_time));
|
| }
|
|
|
| bool GPUTimingClient::IsAvailable() {
|
|
|