| Index: cc/scheduler/compositor_timing_history.h
|
| diff --git a/cc/scheduler/compositor_timing_history.h b/cc/scheduler/compositor_timing_history.h
|
| index fc07c619ec5cee2cd6baafeac2dc1b4bf52a60a1..d85078606a9976a89cd0edd73b839f52fc1f68f2 100644
|
| --- a/cc/scheduler/compositor_timing_history.h
|
| +++ b/cc/scheduler/compositor_timing_history.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
|
| #define CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/rolling_time_delta_history.h"
|
|
|
| namespace base {
|
| @@ -85,7 +86,7 @@ class CC_EXPORT CompositorTimingHistory {
|
|
|
| bool ShouldReportUma() const;
|
|
|
| - static scoped_ptr<UMAReporter> CreateUMAReporter(UMACategory category);
|
| + static std::unique_ptr<UMAReporter> CreateUMAReporter(UMACategory category);
|
| virtual base::TimeTicks Now() const;
|
|
|
| bool using_synchronous_renderer_compositor_;
|
| @@ -125,7 +126,7 @@ class CC_EXPORT CompositorTimingHistory {
|
| base::TimeTicks draw_start_time_;
|
| base::TimeTicks swap_start_time_;
|
|
|
| - scoped_ptr<UMAReporter> uma_reporter_;
|
| + std::unique_ptr<UMAReporter> uma_reporter_;
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation_;
|
|
|
| private:
|
|
|