Replace scoped_ptr with std::unique_ptr in //ui

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc

 // 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.
 
 #include <map>
+#include <memory>
 #include <vector>
 
 // Include views_test_base.h first because the definition of None in X.h
 // conflicts with the definition of None in gtest-type-util.h
 #include "ui/views/test/views_test_base.h"
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
@@ skipping 88 matching lines @@
   ~SimpleTestDragDropClient() override;
 
   // Sets |xid| as the topmost window for all mouse positions.
   void SetTopmostXWindow(XID xid);
 
   // Returns true if the move loop is running.
   bool IsMoveLoopRunning();
 
  private:
   // DesktopDragDropClientAuraX11:
-  scoped_ptr<X11MoveLoop> CreateMoveLoop(
+  std::unique_ptr<X11MoveLoop> CreateMoveLoop(
       X11MoveLoopDelegate* delegate) override;
   XID FindWindowFor(const gfx::Point& screen_point) override;
 
   // The XID of the window which is simulated to be the topmost window.
   XID target_xid_;
 
   // The move loop. Not owned.
   TestMoveLoop* loop_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleTestDragDropClient);
@@ skipping 141 matching lines @@
 }
 
 void SimpleTestDragDropClient::SetTopmostXWindow(XID xid) {
   target_xid_ = xid;
 }
 
 bool SimpleTestDragDropClient::IsMoveLoopRunning() {
   return loop_->IsRunning();
 }
 
-scoped_ptr<X11MoveLoop> SimpleTestDragDropClient::CreateMoveLoop(
+std::unique_ptr<X11MoveLoop> SimpleTestDragDropClient::CreateMoveLoop(
     X11MoveLoopDelegate* delegate) {
   loop_ = new TestMoveLoop(delegate);
-  return make_scoped_ptr(loop_);
+  return base::WrapUnique(loop_);
 }
 
 XID SimpleTestDragDropClient::FindWindowFor(const gfx::Point& screen_point) {
   return target_xid_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TestDragDropClient
 
 // static
@@ skipping 122 matching lines @@
     cursor_manager_.reset();
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
   TestDragDropClient* client() {
     return client_.get();
   }
 
  private:
-  scoped_ptr<TestDragDropClient> client_;
-  scoped_ptr<DesktopNativeCursorManager> cursor_manager_;
+  std::unique_ptr<TestDragDropClient> client_;
+  std::unique_ptr<DesktopNativeCursorManager> cursor_manager_;
 
   // The widget used to initiate drags.
-  scoped_ptr<Widget> widget_;
+  std::unique_ptr<Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11Test);
 };
 
 namespace {
 
 void BasicStep2(TestDragDropClient* client, XID toplevel) {
   EXPECT_TRUE(client->IsMoveLoopRunning());
 
   ClientMessageEventCollector collector(toplevel, client);
@@ skipping 417 matching lines @@
     cursor_manager_.reset();
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
   SimpleTestDragDropClient* client() {
     return client_.get();
   }
 
  private:
-  scoped_ptr<SimpleTestDragDropClient> client_;
-  scoped_ptr<DesktopNativeCursorManager> cursor_manager_;
+  std::unique_ptr<SimpleTestDragDropClient> client_;
+  std::unique_ptr<DesktopNativeCursorManager> cursor_manager_;
 
   // The widget used to initiate drags.
-  scoped_ptr<Widget> widget_;
+  std::unique_ptr<Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11ChromeSourceTargetTest);
 };
 
 namespace {
 
 void ChromeSourceTargetStep2(SimpleTestDragDropClient* client,
                              int modifier_flags) {
   EXPECT_TRUE(client->IsMoveLoopRunning());
 
-  scoped_ptr<Widget> target_widget(new Widget);
+  std::unique_ptr<Widget> target_widget(new Widget);
   Widget::InitParams target_params(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   target_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   target_params.native_widget =
       new DesktopNativeWidgetAura(target_widget.get());
   target_params.bounds = gfx::Rect(100, 100);
   target_widget->Init(target_params);
   target_widget->Show();
 
   TestDragDropDelegate* delegate = new TestDragDropDelegate;
   aura::client::SetDragDropDelegate(target_widget->GetNativeWindow(), delegate);
@@ skipping 57 matching lines @@
 // the aura::client::DragDropDelegate is properly notified.
 TEST_F(DesktopDragDropClientAuraX11ChromeSourceTargetTest, CtrlPressed) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ChromeSourceTargetStep2, client(), ui::EF_CONTROL_DOWN));
   int result = StartDragAndDrop();
   EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result);
 }
 
 }  // namespace views