aura: Require explicit ownership of the Env instance.

ui/aura/test/aura_test_helper.h

Index: ui/aura/test/aura_test_helper.h
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
index 8fcf3625b0b2c28c702a8fb540ce18a03ff60a54..f2fad161242e9aa9487998d9eea5be44b8bd33e8 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -5,11 +5,17 @@
 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_
 #define UI_AURA_TEST_AURA_TEST_HELPER_H_
 
+#include <memory>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 
+namespace aura {
+class Env;
+}
+
 namespace base {
 class MessageLoopForUI;
 }
@@ -57,7 +63,7 @@ class AuraTestHelper {
   base::MessageLoopForUI* message_loop_;
   bool setup_called_;
   bool teardown_called_;
-  bool env_created_;
+  std::unique_ptr<aura::Env> env_;
   scoped_ptr<WindowTreeHost> host_;
   scoped_ptr<TestWindowTreeClient> stacking_client_;
   scoped_ptr<client::DefaultCaptureClient> capture_client_;