Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/common/handle_watcher_unittest.cc

Index: trunk/src/mojo/common/handle_watcher_unittest.cc
===================================================================
--- trunk/src/mojo/common/handle_watcher_unittest.cc	(revision 272588)
+++ trunk/src/mojo/common/handle_watcher_unittest.cc	(working copy)
@@ -6,12 +6,12 @@
 
 #include <string>
 
-#include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "mojo/common/time_helper.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -116,7 +116,7 @@
   base::SimpleTestTickClock tick_clock_;
 
  private:
-  base::ShadowingAtExitManager at_exit_;
+  Environment environment_;
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleWatcherTest);
@@ -318,7 +318,8 @@
   bool was_signaled = false;
   MojoResult result = MOJO_RESULT_OK;
 
-  base::ShadowingAtExitManager at_exit;
+  Environment env;
+
   MessagePipe pipe;
   HandleWatcher watcher;
   {