ui/views: Cleanup usage of scoped_ptr.

ui/views/border.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.
 
 #include "ui/views/border.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
@@ skipping 110 matching lines @@
 }  // namespace
 
 Border::Border() {
 }
 
 Border::~Border() {
 }
 
 // static
 scoped_ptr<Border> Border::NullBorder() {
-  return scoped_ptr<Border>();
+  return nullptr;
 }
 
 // static
 scoped_ptr<Border> Border::CreateSolidBorder(int thickness, SkColor color) {
-  return scoped_ptr<Border>(new SolidBorder(thickness, color));
+  return make_scoped_ptr(new SolidBorder(thickness, color));
 }
 
 // static
 scoped_ptr<Border> Border::CreateEmptyBorder(int top,
                                              int left,
                                              int bottom,
                                              int right) {
-  return scoped_ptr<Border>(new EmptyBorder(top, left, bottom, right));
+  return make_scoped_ptr(new EmptyBorder(top, left, bottom, right));
 }
 
 // static
 scoped_ptr<Border> Border::CreateSolidSidedBorder(int top,
                                                   int left,
                                                   int bottom,
                                                   int right,
                                                   SkColor color) {
-  return scoped_ptr<Border>(
-      new SidedSolidBorder(top, left, bottom, right, color));
+  return make_scoped_ptr(new SidedSolidBorder(top, left, bottom, right, color));
 }
 
 // static
 scoped_ptr<Border> Border::CreateBorderPainter(Painter* painter,
                                                const gfx::Insets& insets) {
-  return scoped_ptr<Border>(new BorderPainter(painter, insets));
+  return make_scoped_ptr(new BorderPainter(painter, insets));
 }
 
 }  // namespace views