| Index: ui/views/controls/styled_label_unittest.cc
|
| diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc
|
| index cae7f67744eefaf82e0d533956c3250409c0ba4c..408212b385cfb68513b7ef29df9c089cc21eccb6 100644
|
| --- a/ui/views/controls/styled_label_unittest.cc
|
| +++ b/ui/views/controls/styled_label_unittest.cc
|
| @@ -2,19 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "ui/views/controls/styled_label.h"
|
| +
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/font_list.h"
|
| #include "ui/views/border.h"
|
| #include "ui/views/controls/link.h"
|
| -#include "ui/views/controls/styled_label.h"
|
| #include "ui/views/controls/styled_label_listener.h"
|
| #include "ui/views/test/views_test_base.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -46,7 +47,7 @@ class StyledLabelTest : public ViewsTestBase, public StyledLabelListener {
|
| }
|
|
|
| private:
|
| - scoped_ptr<StyledLabel> styled_;
|
| + std::unique_ptr<StyledLabel> styled_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(StyledLabelTest);
|
| };
|
|
|