aura: Require explicit ownership of the Env instance.

ui/aura/test/run_all_unittests.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "ui/aura/env.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 class AuraTestSuite : public base::TestSuite {
  public:
   AuraTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  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);
 };
 
 int main(int argc, char** argv) {
   AuraTestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(
       argc,
       argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }