| Index: ui/views/test/x11_property_change_waiter.h
|
| diff --git a/ui/views/test/x11_property_change_waiter.h b/ui/views/test/x11_property_change_waiter.h
|
| index 823813b8285ec0eb8a691a1bc782f799b9481f71..cba356c9311b816e3596b4946c71e0b681a5e239 100644
|
| --- a/ui/views/test/x11_property_change_waiter.h
|
| +++ b/ui/views/test/x11_property_change_waiter.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/events/platform/platform_event_dispatcher.h"
|
| #include "ui/events/platform/platform_event_types.h"
|
| #include "ui/gfx/x/x11_types.h"
|
| @@ -55,9 +56,9 @@ class X11PropertyChangeWaiter : public ui::PlatformEventDispatcher {
|
| // The event mask to be restored upon X11PropertyChangeWaiter's destruction.
|
| long old_event_mask_;
|
|
|
| - scoped_ptr<ui::ScopedEventDispatcher> dispatcher_;
|
| + std::unique_ptr<ui::ScopedEventDispatcher> dispatcher_;
|
|
|
| - scoped_ptr<ui::X11AtomCache> atom_cache_;
|
| + std::unique_ptr<ui::X11AtomCache> atom_cache_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter);
|
| };
|
|
|