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 0cdaf3e7b4a657bb7685f79b63ccf782a4fed4c4..42fc8d8ce6d8e6cdea5270906eefbe80d0ce2eeb 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -10,6 +10,10 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 
+namespace aura {
+class Env;
+}
+
 namespace base {
 class MessageLoopForUI;
 }
@@ -57,7 +61,7 @@ class AuraTestHelper {
   base::MessageLoopForUI* message_loop_;
   bool setup_called_;
   bool teardown_called_;
-  bool env_created_;
+  scoped_ptr<aura::Env> env_;
   scoped_ptr<WindowTreeHost> host_;
   scoped_ptr<TestWindowTreeClient> stacking_client_;
   scoped_ptr<client::DefaultCaptureClient> capture_client_;