Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: ui/aura/test/aura_test_helper.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/aura_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_helper.h
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
index f2fad161242e9aa9487998d9eea5be44b8bd33e8..3a755e06ab4db0caf20c71fb9223fbba1cb89b18 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -8,7 +8,6 @@
#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tree_host.h"
@@ -64,12 +63,12 @@ class AuraTestHelper {
bool setup_called_;
bool teardown_called_;
std::unique_ptr<aura::Env> env_;
- scoped_ptr<WindowTreeHost> host_;
- scoped_ptr<TestWindowTreeClient> stacking_client_;
- scoped_ptr<client::DefaultCaptureClient> capture_client_;
- scoped_ptr<client::FocusClient> focus_client_;
- scoped_ptr<TestScreen> test_screen_;
- scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
+ std::unique_ptr<WindowTreeHost> host_;
+ std::unique_ptr<TestWindowTreeClient> stacking_client_;
+ std::unique_ptr<client::DefaultCaptureClient> capture_client_;
+ std::unique_ptr<client::FocusClient> focus_client_;
+ std::unique_ptr<TestScreen> test_screen_;
+ std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
};
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/aura_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698