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

Unified Diff: content/public/test/unittest_test_suite.cc

Issue 1293013002: 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 | « content/public/test/unittest_test_suite.h ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/unittest_test_suite.cc
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index 573838aad9ba45d450c3eb4cddeb9e60f7c858bb..1a717701c0ab7f248034db91617088f110b47bfe 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -30,8 +30,7 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
#endif
#if defined(USE_AURA)
DCHECK(!aura::Env::GetInstanceDontCreate());
- const bool create_event_source = true;
- aura::Env::CreateInstance(create_event_source);
+ env_ = aura::Env::CreateInstance();
#endif
DCHECK(test_suite);
#if !defined(OS_IOS)
@@ -44,7 +43,7 @@ UnitTestTestSuite::~UnitTestTestSuite() {
blink_test_support_.reset();
#endif
#if defined(USE_AURA)
- aura::Env::DeleteInstance();
+ env_.reset();
#endif
}
« no previous file with comments | « content/public/test/unittest_test_suite.h ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698