Mojo: nuke EnvironmentData

mojo/shell/android/mojo_main.cc

Index: mojo/shell/android/mojo_main.cc
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index 3faf73f2207d356f6872399694064da1706d2531..c2656321d19fd019a8378f9240d49bab05805aa1 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -14,7 +14,6 @@
 #include "base/message_loop/message_loop.h"
 #include "jni/MojoMain_jni.h"
 #include "mojo/public/cpp/application/application.h"
-#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/shell/context.h"
@@ -34,10 +33,6 @@ LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
-
-LazyInstance<scoped_ptr<mojo::Environment> > g_env =
-    LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
@@ -68,8 +63,6 @@ static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
     app_urls.push_back(GURL(base::android::ConvertJavaStringToUTF8(env, jurl)));
 #endif
 
-  g_env.Get().reset(new Environment);
-
   base::android::ScopedJavaGlobalRef<jobject> activity;
   activity.Reset(env, context);