aura: Require explicit ownership of the Env instance.

content/public/test/unittest_test_suite.cc

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 7c45d5ceabc2b8dec9c1c23cd362f12b6d28a930..361236ed3cae39661f72c58ff1a481294fe06cda 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -28,8 +28,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);
   blink_test_support_.reset(new TestBlinkWebUnitTestSupport);
@@ -38,7 +37,7 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
 UnitTestTestSuite::~UnitTestTestSuite() {
   blink_test_support_.reset();
 #if defined(USE_AURA)
-  aura::Env::DeleteInstance();
+  env_.reset();
 #endif
 }