Replace scoped_ptr with std::unique_ptr in //ui

ui/views/style/platform_style.cc

 // Copyright 2015 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/style/platform_style.h"
 
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/focusable_border.h"
@@ skipping 21 matching lines @@
 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = true;
 
 // static
 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
                                                   Combobox::Style style) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
 }
 
 // static
-scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
-  return make_scoped_ptr(new FocusableBorder());
+std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
+  return base::WrapUnique(new FocusableBorder());
 }
 
 // static
-scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() {
+std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground() {
   return nullptr;
 }
 
 // static
-scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
+std::unique_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
     Button::ButtonStyle style) {
   if (!ui::MaterialDesignController::IsModeMaterial() ||
       style != Button::STYLE_TEXTBUTTON) {
-    return make_scoped_ptr(new LabelButtonAssetBorder(style));
+    return base::WrapUnique(new LabelButtonAssetBorder(style));
   }
 
-  scoped_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
+  std::unique_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
   border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
       Button::STYLE_TEXTBUTTON));
   return border;
 }
 
 // static
-scoped_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
-  return make_scoped_ptr(new NativeScrollBar(is_horizontal));
+std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
+  return base::WrapUnique(new NativeScrollBar(is_horizontal));
 }
 
 // static
 SkColor PlatformStyle::TextColorForButton(
     const ButtonColorByState& color_by_state,
     const LabelButton& button) {
   return color_by_state[button.state()];
 }
 
 #endif  // OS_MACOSX
@@ skipping 12 matching lines @@
   label->SetBackgroundColor(
       theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonBackgroundColor));
   label->SetAutoColorReadabilityEnabled(false);
   label->SetShadows(gfx::ShadowValues(
       1, gfx::ShadowValue(gfx::Vector2d(0, 1), 0, kStyleButtonShadowColor)));
 }
 #endif
 
 #if !defined(DESKTOP_LINUX)
 // static
-scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
+std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
     LabelButton* button) {
   return button->CreateDefaultBorder();
 }
 #endif
 
 }  // namespace views