Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/android/javatests/core_test.cc

 // Copyright 2014 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/android/javatests/core_test.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_support_android.h"
 #include "jni/CoreTest_jni.h"
 #include "mojo/public/cpp/environment/environment.h"
 
 namespace {
 
 struct TestEnvironment {
+  mojo::Environment environment;
   base::MessageLoopForUI message_loop;
 };
 
 }  // namespace
 
 namespace mojo {
 namespace android {
 
 static void InitApplicationContext(JNIEnv* env,
                                    jobject jcaller,
@@ skipping 21 matching lines @@
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 bool RegisterCoreTest(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo