| Index: ui/events/test/test_event_processor.h
|
| diff --git a/ui/events/test/test_event_processor.h b/ui/events/test/test_event_processor.h
|
| index 6129756cc5ffd0fa0913cec76acef36b42613d1e..9b71282138d76e4b1577ad9f3dff938b0c94b086 100644
|
| --- a/ui/events/test/test_event_processor.h
|
| +++ b/ui/events/test/test_event_processor.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
|
| #define UI_EVENTS_TEST_TEST_EVENT_PROCESSOR_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/events/event_processor.h"
|
|
|
| namespace ui {
|
| @@ -29,7 +30,7 @@ class TestEventProcessor : public EventProcessor {
|
| should_processing_occur_ = occur;
|
| }
|
|
|
| - void SetRoot(scoped_ptr<EventTarget> root);
|
| + void SetRoot(std::unique_ptr<EventTarget> root);
|
| void Reset();
|
|
|
| // EventProcessor:
|
| @@ -40,7 +41,7 @@ class TestEventProcessor : public EventProcessor {
|
| void OnEventProcessingFinished(Event* event) override;
|
|
|
| private:
|
| - scoped_ptr<EventTarget> root_;
|
| + std::unique_ptr<EventTarget> root_;
|
|
|
| // Used in our override of OnEventProcessingStarted(). If this value is
|
| // false, mark incoming events as handled.
|
|
|