aura: Require explicit ownership of the Env instance.

ui/aura/test/run_all_unittests.cc

Index: ui/aura/test/run_all_unittests.cc
diff --git a/ui/aura/test/run_all_unittests.cc b/ui/aura/test/run_all_unittests.cc
index 7c45000582a4e80145957ca4ec85bdd5ed644dc3..902e3af96ed2ee57538e6c269d274d1a3538914b 100644
--- a/ui/aura/test/run_all_unittests.cc
+++ b/ui/aura/test/run_all_unittests.cc
@@ -16,16 +16,17 @@ class AuraTestSuite : public base::TestSuite {
  protected:
   void Initialize() override {
     base::TestSuite::Initialize();
-    aura::Env::CreateInstance(true);
+    env_ = aura::Env::CreateInstance();
     gfx::GLSurfaceTestSupport::InitializeOneOff();
   }
 
   void Shutdown() override {
-    aura::Env::DeleteInstance();
+    env_.reset();
     base::TestSuite::Shutdown();
   }
 
  private:
+  scoped_ptr<aura::Env> env_;
   DISALLOW_COPY_AND_ASSIGN(AuraTestSuite);
 };