Mojo: nuke EnvironmentData

mojo/mojo.gyp

 # 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 320 matching lines @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_system_impl',
       ],
       'sources': [
         'common/channel_init.cc',
         'common/channel_init.h',
         'common/common_type_converters.cc',
         'common/common_type_converters.h',
         'common/data_pipe_utils.cc',
         'common/data_pipe_utils.h',
-        'common/environment_data.cc',
-        'common/environment_data.h',
         'common/handle_watcher.cc',
         'common/handle_watcher.h',
         'common/message_pump_mojo.cc',
         'common/message_pump_mojo.h',
         'common/message_pump_mojo_handler.h',
         'common/time_helper.cc',
         'common/time_helper.h',
       ],
     },
     {
@@ skipping 400 matching lines @@
         },
         {
           'target_name': 'libmojo_java_unittest',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             'libmojo_system_java',
             'mojo_jni_headers',
           ],
+          'defines': [
+            'UNIT_TEST'  # As exported from testing/gtest.gyp:gtest.
+          ],
           'sources': [
             'android/javatests/mojo_test_case.cc',
             'android/javatests/mojo_test_case.h',
             'android/javatests/init_library.cc',
           ],
         },
         {
           'target_name': 'mojo_test_apk',
           'type': 'none',
           'dependencies': [
@@ skipping 166 matching lines @@
             'views/native_widget_view_manager.cc',
             'views/native_widget_view_manager.h',
             'views/views_init.cc',
             'views/views_init.h',
           ],
         },
       ],
     }],
   ],
 }