Replace scoped_ptr with std::unique_ptr in //ui

ui/views/view.cc

 // Copyright (c) 2012 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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
+#include <memory>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
@@ skipping 446 matching lines @@
     return;
 
   paint_to_layer_ = paint_to_layer;
   if (paint_to_layer_ && !layer()) {
     CreateLayer();
   } else if (!paint_to_layer_ && layer()) {
     DestroyLayer();
   }
 }
 
-scoped_ptr<ui::Layer> View::RecreateLayer() {
-  scoped_ptr<ui::Layer> old_layer = LayerOwner::RecreateLayer();
+std::unique_ptr<ui::Layer> View::RecreateLayer() {
+  std::unique_ptr<ui::Layer> old_layer = LayerOwner::RecreateLayer();
   Widget* widget = GetWidget();
   if (widget)
     widget->UpdateRootLayers();
   return old_layer;
 }
 
 // RTL positioning -------------------------------------------------------------
 
 gfx::Rect View::GetMirroredBounds() const {
   gfx::Rect bounds(bounds_);
@@ skipping 357 matching lines @@
   }
 
   // View::Paint() recursion over the subtree.
   PaintChildren(context);
 }
 
 void View::set_background(Background* b) {
   background_.reset(b);
 }
 
-void View::SetBorder(scoped_ptr<Border> b) {
+void View::SetBorder(std::unique_ptr<Border> b) {
   border_ = std::move(b);
 }
 
 const ui::ThemeProvider* View::GetThemeProvider() const {
   const Widget* widget = GetWidget();
   return widget ? widget->GetThemeProvider() : nullptr;
 }
 
 const ui::NativeTheme* View::GetNativeTheme() const {
   const Widget* widget = GetWidget();
@@ skipping 187 matching lines @@
 
 void View::OnGestureEvent(ui::GestureEvent* event) {
 }
 
 const ui::InputMethod* View::GetInputMethod() const {
   Widget* widget = const_cast<Widget*>(GetWidget());
   return widget ? const_cast<const ui::InputMethod*>(widget->GetInputMethod())
                 : nullptr;
 }
 
-scoped_ptr<ViewTargeter>
-View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
-  scoped_ptr<ViewTargeter> old_targeter = std::move(targeter_);
+std::unique_ptr<ViewTargeter> View::SetEventTargeter(
+    std::unique_ptr<ViewTargeter> targeter) {
+  std::unique_ptr<ViewTargeter> old_targeter = std::move(targeter_);
   targeter_ = std::move(targeter);
   return old_targeter;
 }
 
 ViewTargeter* View::GetEffectiveViewTargeter() const {
   DCHECK(GetWidget());
   ViewTargeter* view_targeter = targeter();
   if (!view_targeter)
     view_targeter = GetWidget()->GetRootView()->targeter();
   CHECK(view_targeter);
   return view_targeter;
 }
 
 bool View::CanAcceptEvent(const ui::Event& event) {
   return IsDrawn();
 }
 
 ui::EventTarget* View::GetParentTarget() {
   return parent_;
 }
 
-scoped_ptr<ui::EventTargetIterator> View::GetChildIterator() const {
-  return make_scoped_ptr(new ui::EventTargetIteratorImpl<View>(children_));
+std::unique_ptr<ui::EventTargetIterator> View::GetChildIterator() const {
+  return base::WrapUnique(new ui::EventTargetIteratorImpl<View>(children_));
 }
 
 ui::EventTargeter* View::GetEventTargeter() {
   return targeter_.get();
 }
 
 void View::ConvertEventToTarget(ui::EventTarget* target,
                                 ui::LocatedEvent* event) {
   event->ConvertLocationToTarget(this, static_cast<View*>(target));
 }
@@ skipping 696 matching lines @@
                              bool update_focus_cycle,
                              bool update_tool_tip,
                              bool delete_removed_view,
                              View* new_parent) {
   DCHECK(view);
 
   const Views::iterator i(std::find(children_.begin(), children_.end(), view));
   if (i == children_.end())
     return;
 
-  scoped_ptr<View> view_to_be_deleted;
+  std::unique_ptr<View> view_to_be_deleted;
   if (update_focus_cycle) {
     View* next_focusable = view->next_focusable_view_;
     View* prev_focusable = view->previous_focusable_view_;
     if (prev_focusable)
       prev_focusable->next_focusable_view_ = next_focusable;
     if (next_focusable)
       next_focusable->previous_focusable_view_ = prev_focusable;
   }
 
   Widget* widget = GetWidget();
@@ skipping 603 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views