aura: Require explicit ownership of the Env instance.

ash/test/test_suite.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/test_suite.h"
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
@@ skipping 54 matching lines @@
       path.Append(FILE_PATH_LITERAL("ash_test_resources_100_percent.pak"));
   base::FilePath ash_test_resources_200 =
       path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
 
   ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   rb.AddDataPackFromPath(ash_test_resources_100, ui::SCALE_FACTOR_100P);
   rb.AddDataPackFromPath(ash_test_resources_200, ui::SCALE_FACTOR_200P);
 
   base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
-  aura::Env::CreateInstance(true);
+  env_ = aura::Env::CreateInstance();
 }
 
 void AuraShellTestSuite::Shutdown() {
-  aura::Env::DeleteInstance();
+  env_.reset();
   ui::ResourceBundle::CleanupSharedInstance();
 #if defined(OS_WIN)
   com_initializer_.reset();
 #endif
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ash