| Index: cc/test/fake_painted_scrollbar_layer.h
|
| diff --git a/cc/test/fake_painted_scrollbar_layer.h b/cc/test/fake_painted_scrollbar_layer.h
|
| index 3568087c2d95ac404bd2480a7edfc3ed5fbac142..3391797a8577093069b7dc6edd9b448f9a0383dc 100644
|
| --- a/cc/test/fake_painted_scrollbar_layer.h
|
| +++ b/cc/test/fake_painted_scrollbar_layer.h
|
| @@ -7,7 +7,8 @@
|
|
|
| #include <stddef.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "cc/layers/painted_scrollbar_layer.h"
|
| #include "cc/test/fake_scrollbar.h"
|
|
|
| @@ -28,7 +29,7 @@ class FakePaintedScrollbarLayer : public PaintedScrollbarLayer {
|
|
|
| void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| - scoped_ptr<base::AutoReset<bool>> IgnoreSetNeedsCommit();
|
| + std::unique_ptr<base::AutoReset<bool>> IgnoreSetNeedsCommit();
|
|
|
| size_t push_properties_count() const { return push_properties_count_; }
|
| void reset_push_properties_count() { push_properties_count_ = 0; }
|
|
|