ui/base: Cleanup usage of scoped_ptr.

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

The entries were found with the following command line:

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

BUG=None
TEST=ui_base_unittests
R=sky@chromium.org

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

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

9 files changed, 17 insertions, 19 deletions

diff --git a/ui/base/accelerators/platform_accelerator_cocoa.mm b/ui/base/accelerators/platform_accelerator_cocoa.mm
index cffc458..ce2b437 100644
--- a/ui/base/accelerators/platform_accelerator_cocoa.mm
+++ b/ui/base/accelerators/platform_accelerator_cocoa.mm
@@ -24,7 +24,7 @@ scoped_ptr<PlatformAccelerator> PlatformAcceleratorCocoa::CreateCopy() const {
   scoped_ptr<PlatformAcceleratorCocoa> copy(new PlatformAcceleratorCocoa);
   copy->characters_.reset([characters_ copy]);
   copy->modifier_mask_ = modifier_mask_;
-  return scoped_ptr<PlatformAccelerator>(copy.release());
+  return make_scoped_ptr(copy.release());
 }
 
 bool PlatformAcceleratorCocoa::Equals(const PlatformAccelerator& rhs) const {
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc
index e1ad03d..c80e75a 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -37,20 +37,20 @@ scoped_ptr<InputMethod> CreateInputMethod(
     g_create_input_method_called = true;
 
   if (g_input_method_set_for_testing)
-    return scoped_ptr<InputMethod>(new MockInputMethod(delegate));
+    return make_scoped_ptr(new MockInputMethod(delegate));
 
 #if defined(OS_CHROMEOS)
-  return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate));
+  return make_scoped_ptr(new InputMethodChromeOS(delegate));
 #elif defined(OS_WIN)
   if (IsRemoteInputMethodWinRequired(widget))
     return CreateRemoteInputMethodWin(delegate);
-  return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget));
+  return make_scoped_ptr(new InputMethodWin(delegate, widget));
 #elif defined(OS_MACOSX)
-  return scoped_ptr<InputMethod>(new InputMethodMac(delegate));
+  return make_scoped_ptr(new InputMethodMac(delegate));
 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
+  return make_scoped_ptr(new InputMethodAuraLinux(delegate));
 #else
-  return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
+  return make_scoped_ptr(new InputMethodMinimal(delegate));
 #endif
 }
 
diff --git a/ui/base/ime/linux/fake_input_method_context_factory.cc b/ui/base/ime/linux/fake_input_method_context_factory.cc
index ba9edf6..f604595 100644
--- a/ui/base/ime/linux/fake_input_method_context_factory.cc
+++ b/ui/base/ime/linux/fake_input_method_context_factory.cc
@@ -10,12 +10,10 @@ namespace ui {
 
 FakeInputMethodContextFactory::FakeInputMethodContextFactory() {}
 
-// Overriden from ui::LinuxInputMethodContextFactory
-
 scoped_ptr<LinuxInputMethodContext>
 FakeInputMethodContextFactory::CreateInputMethodContext(
     LinuxInputMethodContextDelegate* /* delegate */) const {
-  return scoped_ptr<LinuxInputMethodContext>(new FakeInputMethodContext());
+  return make_scoped_ptr(new FakeInputMethodContext());
 }
 
 }  // namespace ui
diff --git a/ui/base/ime/linux/fake_input_method_context_factory.h b/ui/base/ime/linux/fake_input_method_context_factory.h
index f3d7989..111be8f 100644
--- a/ui/base/ime/linux/fake_input_method_context_factory.h
+++ b/ui/base/ime/linux/fake_input_method_context_factory.h
@@ -15,7 +15,7 @@ class FakeInputMethodContextFactory : public LinuxInputMethodContextFactory {
  public:
   FakeInputMethodContextFactory();
 
-  // Overriden from ui::LinuxInputMethodContextFactory
+  // LinuxInputMethodContextFactory:
   scoped_ptr<LinuxInputMethodContext> CreateInputMethodContext(
       LinuxInputMethodContextDelegate* delegate) const override;
 
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc
index db74af4..f198fc8 100644
--- a/ui/base/ime/remote_input_method_win.cc
+++ b/ui/base/ime/remote_input_method_win.cc
@@ -392,7 +392,7 @@ RemoteInputMethodPrivateWin::RemoteInputMethodPrivateWin() {}
 
 scoped_ptr<InputMethod> CreateRemoteInputMethodWin(
     internal::InputMethodDelegate* delegate) {
-  return scoped_ptr<InputMethod>(new RemoteInputMethodWin(delegate));
+  return make_scoped_ptr(new RemoteInputMethodWin(delegate));
 }
 
 // static
diff --git a/ui/base/l10n/l10n_util_plurals.cc b/ui/base/l10n/l10n_util_plurals.cc
index ee98d732..afc36a85 100644
--- a/ui/base/l10n/l10n_util_plurals.cc
+++ b/ui/base/l10n/l10n_util_plurals.cc
@@ -54,10 +54,10 @@ scoped_ptr<icu::PluralFormat> BuildPluralFormat(
       pattern += UNICODE_STRING_SIMPLE("}");
     }
   }
-  scoped_ptr<icu::PluralFormat> format = scoped_ptr<icu::PluralFormat>(
-      new icu::PluralFormat(*rules, pattern, err));
+  scoped_ptr<icu::PluralFormat> format =
+      make_scoped_ptr(new icu::PluralFormat(*rules, pattern, err));
   if (!U_SUCCESS(err)) {
-    return scoped_ptr<icu::PluralFormat>();
+    return nullptr;
   }
   return format.Pass();
 }
diff --git a/ui/base/nine_image_painter_factory.cc b/ui/base/nine_image_painter_factory.cc
index b22ba67..3b47160 100644
--- a/ui/base/nine_image_painter_factory.cc
+++ b/ui/base/nine_image_painter_factory.cc
@@ -25,7 +25,7 @@ std::vector<gfx::ImageSkia> ImageIdsToImages(const int image_ids[]) {
 
 scoped_ptr<gfx::NineImagePainter> CreateNineImagePainter(
     const int image_ids[]) {
-  return scoped_ptr<gfx::NineImagePainter>(
+  return make_scoped_ptr(
       new gfx::NineImagePainter(ImageIdsToImages(image_ids)));
 }
 
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 10fa783..b08a580 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -753,8 +753,8 @@ scoped_ptr<gfx::FontList> ResourceBundle::GetFontListFromDelegate(
   DCHECK(delegate_);
   scoped_ptr<gfx::Font> font = delegate_->GetFont(style);
   if (font.get())
-    return scoped_ptr<gfx::FontList>(new gfx::FontList(*font));
-  return scoped_ptr<gfx::FontList>();
+    return make_scoped_ptr(new gfx::FontList(*font));
+  return nullptr;
 }
 
 bool ResourceBundle::LoadBitmap(const ResourceHandle& data_handle,
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index 4acf863..c290e49 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -90,7 +90,7 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
                gfx::Font*(ui::ResourceBundle::FontStyle style));
   virtual scoped_ptr<gfx::Font> GetFont(
       ui::ResourceBundle::FontStyle style) override {
-    return scoped_ptr<gfx::Font>(GetFontMock(style));
+    return make_scoped_ptr(GetFontMock(style));
   }
 };