Replace scoped_ptr with std::unique_ptr in //ui

ui/views/test/x11_property_change_waiter.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
 
 #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"
 
 namespace ui {
 class ScopedEventDispatcher;
 class X11AtomCache;
 }
 
 namespace views {
@@ skipping 25 matching lines @@
 
   // Whether Wait() should block.
   bool wait_;
 
   // Ends the run loop.
   base::Closure quit_closure_;
 
   // 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);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_