Revert of aura: Require explicit ownership of the Env instance.

ui/aura/test/aura_test_helper.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 "ui/aura/test/aura_test_helper.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 16 matching lines @@
 #if defined(USE_X11)
 #include "ui/aura/window_tree_host_x11.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace aura {
 namespace test {
 
 AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop)
     : setup_called_(false),
-      teardown_called_(false) {
+      teardown_called_(false),
+      env_created_(false) {
   DCHECK(message_loop);
   message_loop_ = message_loop;
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
 #if defined(USE_X11)
   test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
   InitializeAuraEventGeneratorDelegate();
 }
 
 AuraTestHelper::~AuraTestHelper() {
   CHECK(setup_called_)
       << "AuraTestHelper::SetUp() never called.";
   CHECK(teardown_called_)
       << "AuraTestHelper::TearDown() never called.";
 }
 
 void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
   setup_called_ = true;
 
-  if (!Env::GetInstanceDontCreate())
-    env_ = aura::Env::CreateInstance();
+  if (!Env::GetInstanceDontCreate()) {
+    env_created_ = true;
+    Env::CreateInstance(true);
+  }
   Env::GetInstance()->set_context_factory(context_factory);
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   EnvTestHelper env_helper(Env::GetInstance());
   env_helper.SetInputStateLookup(nullptr);
   env_helper.ResetEventState();
 
   ui::InitializeInputMethodForTesting();
 
   gfx::Size host_size(800, 600);
@@ skipping 21 matching lines @@
   ui::GestureRecognizer::Reset();
   test_screen_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 
 #if defined(USE_X11)
   ui::test::ResetXCursorCache();
 #endif
 
   ui::ShutdownInputMethodForTesting();
 
-  env_.reset();
+  if (env_created_)
+    Env::DeleteInstance();
 }
 
 void AuraTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace aura