ui/views: Cleanup usage of scoped_ptr.

* Return nullptr whenever possible.
* Use make_scoped_ptr() when possible (less typing/noise).

Entries found with the following command line:

$ git grep -E '(=|\breturn)\s*scoped_ptr<.*?>([^)]+)' ui/views

BUG=None
R=sky@chromium.org

Review URL: https://codereview.chromium.org/809903005

Cr-Commit-Position: refs/heads/master@{#310603}

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/views/painter.cc b/ui/views/painter.cc
index 56dedb1..42db547 100644
--- a/ui/views/painter.cc
+++ b/ui/views/painter.cc
@@ -272,20 +272,20 @@ Painter* Painter::CreateImageGridPainter(const int image_ids[]) {
 
 // static
 scoped_ptr<Painter> Painter::CreateDashedFocusPainter() {
-  return scoped_ptr<Painter>(new DashedFocusPainter(gfx::Insets())).Pass();
+  return make_scoped_ptr(new DashedFocusPainter(gfx::Insets()));
 }
 
 // static
 scoped_ptr<Painter> Painter::CreateDashedFocusPainterWithInsets(
     const gfx::Insets& insets) {
-  return scoped_ptr<Painter>(new DashedFocusPainter(insets)).Pass();
+  return make_scoped_ptr(new DashedFocusPainter(insets));
 }
 
 // static
 scoped_ptr<Painter> Painter::CreateSolidFocusPainter(
     SkColor color,
     const gfx::Insets& insets) {
-  return scoped_ptr<Painter>(new SolidFocusPainter(color, insets)).Pass();
+  return make_scoped_ptr(new SolidFocusPainter(color, insets));
 }
 
 // HorizontalPainter ----------------------------------------------------------