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

Unified Diff: ash/test/ash_test_base.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/system/win/audio/tray_audio_win.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index c8aa7365044bf99d70c1ecada6db906d8ec79ccd..4aaccacb95fa89ce842b1613489115bcfd30c069 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
@@ -148,9 +149,9 @@ class AshTestBase : public testing::Test {
bool teardown_called_;
// |SetUp()| doesn't activate session if this is set to false.
bool start_session_;
- scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
- scoped_ptr<AshTestHelper> ash_test_helper_;
- scoped_ptr<ui::test::EventGenerator> event_generator_;
+ std::unique_ptr<content::TestBrowserThreadBundle> thread_bundle_;
+ std::unique_ptr<AshTestHelper> ash_test_helper_;
+ std::unique_ptr<ui::test::EventGenerator> event_generator_;
#if defined(OS_WIN)
ui::ScopedOleInitializer ole_initializer_;
#endif
« no previous file with comments | « ash/system/win/audio/tray_audio_win.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698