ui: Cleanup the usage of scoped_ptr throughout.

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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 #include "ui/gfx/geometry/rect_f.h"
 
@@ skipping 74 matching lines @@
 
   void OnHandleDragEnd(const TouchHandle& handle) override {
     dragging_ = false;
   }
 
   void OnHandleTapped(const TouchHandle& handle) override { tapped_ = true; }
 
   void SetNeedsAnimate() override { needs_animate_ = true; }
 
   scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
-    return scoped_ptr<TouchHandleDrawable>(
-        new MockTouchHandleDrawable(&drawable_data_));
+    return make_scoped_ptr(new MockTouchHandleDrawable(&drawable_data_));
   }
 
   base::TimeDelta GetTapTimeout() const override {
     return base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs);
   }
 
   float GetTapSlop() const override { return kDefaultTapSlop; }
 
   void Animate(TouchHandle& handle) {
     needs_animate_ = false;
@@ skipping 391 matching lines @@
   event = MockMotionEvent(
       MockMotionEvent::ACTION_MOVE, event_time, kDefaultTapSlop * 2.f, 0);
   EXPECT_TRUE(handle.WillHandleTouchEvent(event));
   event = MockMotionEvent(
       MockMotionEvent::ACTION_UP, event_time, kDefaultTapSlop * 2.f, 0);
   EXPECT_TRUE(handle.WillHandleTouchEvent(event));
   EXPECT_FALSE(GetAndResetHandleTapped());
 }
 
 }  // namespace ui