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

Unified Diff: ash/test/test_suite.cc

Issue 1297173003: Revert of aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/test/test_suite.h ('k') | chrome/test/base/view_event_test_platform_part_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_suite.cc
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index fd6b67cddb6e7d2b49226ff5cf7dac12796c286f..c39c76bdbef4ad251c415bb2d1585bd2a1030ac6 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -59,11 +59,11 @@
"en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
- env_ = aura::Env::CreateInstance();
+ aura::Env::CreateInstance(true);
}
void AuraShellTestSuite::Shutdown() {
- env_.reset();
+ aura::Env::DeleteInstance();
ui::ResourceBundle::CleanupSharedInstance();
#if defined(OS_WIN)
com_initializer_.reset();
« no previous file with comments | « ash/test/test_suite.h ('k') | chrome/test/base/view_event_test_platform_part_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698