Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/service_manager/service_manager_unittest.cc

Index: trunk/src/mojo/service_manager/service_manager_unittest.cc
===================================================================
--- trunk/src/mojo/service_manager/service_manager_unittest.cc	(revision 272588)
+++ trunk/src/mojo/service_manager/service_manager_unittest.cc	(working copy)
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/at_exit.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_loader.h"
@@ -180,7 +180,7 @@
   }
 
  protected:
-  base::ShadowingAtExitManager at_exit_;
+  mojo::Environment env_;
   base::MessageLoop loop_;
   TestContext context_;
   scoped_ptr<TestClientImpl> test_client_;