| Index: ui/views/controls/slider_unittest.cc
|
| diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc
|
| index ded1f367c5a2dd086886f310029f297558939bca..46641a212e292f2f967d88e6cbbe54a08b55280c 100644
|
| --- a/ui/views/controls/slider_unittest.cc
|
| +++ b/ui/views/controls/slider_unittest.cc
|
| @@ -4,11 +4,11 @@
|
|
|
| #include "ui/views/controls/slider.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/i18n/rtl.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
| @@ -169,7 +169,7 @@ class SliderTest : public views::ViewsTestBase {
|
| // The widget container for the slider being tested.
|
| views::Widget* widget_;
|
| // An event generator.
|
| - scoped_ptr<ui::test::EventGenerator> event_generator_;
|
| + std::unique_ptr<ui::test::EventGenerator> event_generator_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SliderTest);
|
| };
|
|
|