| Index: ui/gfx/x/x11_atom_cache.cc
|
| diff --git a/ui/gfx/x/x11_atom_cache.cc b/ui/gfx/x/x11_atom_cache.cc
|
| index 5288d6d287f248e8078248ad1b09ed215d2334d1..0d179343135a3e71ac29836595d40836944b54db 100644
|
| --- a/ui/gfx/x/x11_atom_cache.cc
|
| +++ b/ui/gfx/x/x11_atom_cache.cc
|
| @@ -7,8 +7,9 @@
|
| #include <X11/Xatom.h>
|
| #include <X11/Xlib.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace ui {
|
|
|
| @@ -19,7 +20,7 @@ X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char* const* to_cache)
|
| for (const char* const* i = to_cache; *i; ++i)
|
| ++cache_count;
|
|
|
| - scoped_ptr<XAtom[]> cached_atoms(new XAtom[cache_count]);
|
| + std::unique_ptr<XAtom[]> cached_atoms(new XAtom[cache_count]);
|
|
|
| // Grab all the atoms we need now to minimize roundtrips to the X11 server.
|
| XInternAtoms(xdisplay_,
|
|
|