| Index: ui/base/clipboard/clipboard_test_template.h
|
| diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h
|
| index 122fb4e196dfb7c30dd5a4b7356f8b377b2a58e6..b2deb2210824c99ede0cd03e186eb53b9881f168 100644
|
| --- a/ui/base/clipboard/clipboard_test_template.h
|
| +++ b/ui/base/clipboard/clipboard_test_template.h
|
| @@ -12,18 +12,17 @@
|
| // TODO(dcheng): This is really horrible. In general, all tests should run on
|
| // all platforms, to avoid this mess.
|
|
|
| -#include "build/build_config.h"
|
| -
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/pickle.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "build/build_config.h"
|
| #include "testing/gmock/include/gmock/gmock-matchers.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
| @@ -78,7 +77,7 @@ class ClipboardTest : public PlatformTest {
|
| private:
|
| base::MessageLoopForUI message_loop_;
|
| #if defined(USE_AURA)
|
| - scoped_ptr<PlatformEventSource> event_source_;
|
| + std::unique_ptr<PlatformEventSource> event_source_;
|
| #endif
|
| // ui::Clipboard has a protected destructor, so scoped_ptr doesn't work here.
|
| Clipboard* const clipboard_;
|
|
|