Replace scoped_ptr with std::unique_ptr in //ui

ui/touch_selection/touch_handle_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 "ui/touch_selection/touch_handle.h"
 
+#include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/touch_selection/touch_handle_orientation.h"
 
 using ui::test::MockMotionEvent;
 
 namespace ui {
 namespace {
 
@@ skipping 83 matching lines @@
   }
 
   bool IsWithinTapSlop(const gfx::Vector2dF& delta) const override {
     return delta.LengthSquared() < (kDefaultTapSlop * kDefaultTapSlop);
   }
 
   void OnHandleTapped(const TouchHandle& handle) override { tapped_ = true; }
 
   void SetNeedsAnimate() override { needs_animate_ = true; }
 
-  scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
-    return make_scoped_ptr(new MockTouchHandleDrawable(&drawable_data_));
+  std::unique_ptr<TouchHandleDrawable> CreateDrawable() override {
+    return base::WrapUnique(new MockTouchHandleDrawable(&drawable_data_));
   }
 
   base::TimeDelta GetMaxTapDuration() const override {
     return base::TimeDelta::FromMilliseconds(kDefaultTapDurationMs);
   }
 
   bool IsAdaptiveHandleOrientationEnabled() const override {
     // Enable adaptive handle orientation by default for unittests
     return true;
   }
@@ skipping 556 matching lines @@
   UpdateViewportRect(handle, gfx::RectF(0, 0, 230, 600));
   EXPECT_TRUE(drawable().mirror_vertical);
   EXPECT_TRUE(drawable().mirror_horizontal);
 
   UpdateViewportRect(handle, kDefaultViewportRect);
   EXPECT_FALSE(drawable().mirror_vertical);
   EXPECT_FALSE(drawable().mirror_horizontal);
 }
 
 }  // namespace ui