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

Unified Diff: ash/test/ash_test_helper.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index f5a27b4d7bf175c55301c76c9fac8eb0012b3bb2..060f8c1bee54bb80d096b65b204b0b9e5c52ca28 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -118,8 +118,8 @@ void AshTestHelper::SetUp(bool start_session) {
init_params.context_factory = context_factory;
init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
ash::Shell::CreateInstance(init_params);
- aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup(
- scoped_ptr<aura::InputStateLookup>());
+ aura::test::EnvTestHelper(aura::Env::GetInstance())
+ .SetInputStateLookup(std::unique_ptr<aura::InputStateLookup>());
Shell* shell = Shell::GetInstance();
if (start_session) {
@@ -132,7 +132,7 @@ void AshTestHelper::SetUp(bool start_session) {
test_screenshot_delegate_ = new TestScreenshotDelegate();
shell->accelerator_controller()->SetScreenshotDelegate(
- scoped_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
+ std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
}
void AshTestHelper::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698