Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/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 302 matching lines @@
       ],
       'export_dependent_settings': [
         '../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/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 565 matching lines @@
             'aura/screen_mojo.cc',
             'aura/screen_mojo.h',
             'aura/window_tree_host_mojo.cc',
             'aura/window_tree_host_mojo.h',
           ],
         },
       ],
     }],
   ],
 }