Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/common/handle_watcher_unittest.cc

 // Copyright 2013 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 "mojo/common/handle_watcher.h"
 
 #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"
 
 namespace mojo {
 namespace common {
 namespace test {
 
 void ObserveCallback(bool* was_signaled,
                      MojoResult* result_observed,
@@ skipping 84 matching lines @@
   }
 
  protected:
   void InstallTickClock() {
     test::SetTickClockForTest(&tick_clock_);
   }
 
   base::SimpleTestTickClock tick_clock_;
 
  private:
-  base::ShadowingAtExitManager at_exit_;
+  Environment environment_;
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleWatcherTest);
 };
 
 // Trivial test case with a single handle to watch.
 TEST_F(HandleWatcherTest, SingleHandler) {
   MessagePipe test_pipe;
   ASSERT_TRUE(test_pipe.handle0.is_valid());
   CallbackHelper callback_helper;
@@ skipping 181 matching lines @@
   EXPECT_TRUE(mojo::test::WriteTextMessage(test_pipe.handle0.get(),
                                            std::string()));
   callback_helper.RunUntilGotCallback();
   EXPECT_TRUE(callback_helper.got_callback());
 }
 
 TEST(HandleWatcherCleanEnvironmentTest, AbortedOnMessageLoopDestruction) {
   bool was_signaled = false;
   MojoResult result = MOJO_RESULT_OK;
 
-  base::ShadowingAtExitManager at_exit;
+  Environment env;
+
   MessagePipe pipe;
   HandleWatcher watcher;
   {
     base::MessageLoop loop;
 
     watcher.Start(pipe.handle0.get(),
                   MOJO_WAIT_FLAG_READABLE,
                   MOJO_DEADLINE_INDEFINITE,
                   base::Bind(&ObserveCallback, &was_signaled, &result));
 
     // Now, let the MessageLoop get torn down. We expect our callback to run.
   }
 
   EXPECT_TRUE(was_signaled);
   EXPECT_EQ(MOJO_RESULT_ABORTED, result);
 }
 
 }  // namespace test
 }  // namespace common
 }  // namespace mojo