Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/shell/android/mojo_main.cc

Index: trunk/src/mojo/shell/android/mojo_main.cc
===================================================================
--- trunk/src/mojo/shell/android/mojo_main.cc	(revision 272588)
+++ trunk/src/mojo/shell/android/mojo_main.cc	(working copy)
@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "jni/MojoMain_jni.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
@@ -33,6 +34,10 @@
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
+
+LazyInstance<scoped_ptr<mojo::Environment> > g_env =
+    LAZY_INSTANCE_INITIALIZER;
+
 }  // namspace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
@@ -69,6 +74,8 @@
     CommandLine::ForCurrentProcess()->InitFromArgv(argv);
   }
 
+  g_env.Get().reset(new Environment);
+
   base::android::ScopedJavaGlobalRef<jobject> activity;
   activity.Reset(env, context);