| Index: ui/base/test/scoped_fake_nswindow_focus.h
|
| diff --git a/ui/base/test/scoped_fake_nswindow_focus.h b/ui/base/test/scoped_fake_nswindow_focus.h
|
| index fd0597fa69afe43d59bb2afc86d2e2c643b2a831..c166365b1646139043665121a2834ae6e1304e06 100644
|
| --- a/ui/base/test/scoped_fake_nswindow_focus.h
|
| +++ b/ui/base/test/scoped_fake_nswindow_focus.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_BASE_TEST_SCOPED_FAKE_NSWINDOW_FOCUS_H_
|
| #define UI_BASE_TEST_SCOPED_FAKE_NSWINDOW_FOCUS_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace base {
|
| namespace mac {
|
| @@ -26,10 +27,10 @@ class ScopedFakeNSWindowFocus {
|
| ~ScopedFakeNSWindowFocus();
|
|
|
| private:
|
| - scoped_ptr<base::mac::ScopedObjCClassSwizzler> is_main_swizzler_;
|
| - scoped_ptr<base::mac::ScopedObjCClassSwizzler> make_main_swizzler_;
|
| - scoped_ptr<base::mac::ScopedObjCClassSwizzler> is_key_swizzler_;
|
| - scoped_ptr<base::mac::ScopedObjCClassSwizzler> make_key_swizzler_;
|
| + std::unique_ptr<base::mac::ScopedObjCClassSwizzler> is_main_swizzler_;
|
| + std::unique_ptr<base::mac::ScopedObjCClassSwizzler> make_main_swizzler_;
|
| + std::unique_ptr<base::mac::ScopedObjCClassSwizzler> is_key_swizzler_;
|
| + std::unique_ptr<base::mac::ScopedObjCClassSwizzler> make_key_swizzler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedFakeNSWindowFocus);
|
| };
|
|
|