| Index: ui/views/style/mac/dialog_button_border_mac_unittest.cc
|
| diff --git a/ui/views/style/mac/dialog_button_border_mac_unittest.cc b/ui/views/style/mac/dialog_button_border_mac_unittest.cc
|
| index 471715b7613a8cc1d082fb3a35c940253651e719..a3b7be3582f108eb572fc488e17fe2d9a1e7ab49 100644
|
| --- a/ui/views/style/mac/dialog_button_border_mac_unittest.cc
|
| +++ b/ui/views/style/mac/dialog_button_border_mac_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ui/views/style/mac/dialog_button_border_mac.h"
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "ui/compositor/canvas_painter.h"
|
| @@ -26,11 +27,11 @@ class TestLabelButton : public LabelButton {
|
| void set_provide_custom_border(bool value) { provide_custom_border_ = value; }
|
|
|
| // LabelButton:
|
| - scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
|
| + std::unique_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
|
| if (!provide_custom_border_)
|
| return LabelButton::CreateDefaultBorder();
|
|
|
| - return make_scoped_ptr(new LabelButtonAssetBorder(style()));
|
| + return base::WrapUnique(new LabelButtonAssetBorder(style()));
|
| }
|
|
|
| private:
|
|
|