Revert of Straightens outs DEPS in mojo/common

mojo/mojo_base.gyp

 # 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.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
     '../third_party/mojo/mojo_variables.gypi',
@@ skipping 18 matching lines @@
             '../third_party/mojo/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
     },
     {
       'target_name': 'mojo_none',
       'type': 'none',
     },
     {
-      # GN version: //mojo/message_pump
-      'target_name': 'mojo_message_pump_lib',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(mojo_system_for_component)',
-      ],
-      'export_dependent_settings': [
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      ],
-      'sources': [
-        'message_pump/handle_watcher.cc',
-        'message_pump/handle_watcher.h',
-        'message_pump/message_pump_mojo.cc',
-        'message_pump/message_pump_mojo.h',
-        'message_pump/message_pump_mojo_handler.h',
-        'message_pump/time_helper.cc',
-        'message_pump/time_helper.h',
-      ],
-    },
-    {
       # GN version: //mojo/common
       'target_name': 'mojo_common_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_COMMON_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'sources': [
         'common/common_type_converters.cc',
         'common/common_type_converters.h',
         'common/data_pipe_file_utils.cc',
         'common/data_pipe_utils.cc',
         'common/data_pipe_utils.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',
       ],
     },
     {
       # GN version: //mojo/common:url_type_converters
       'target_name': 'mojo_url_type_converters',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../url/url.gyp:url_lib',
@@ skipping 29 matching lines @@
     {
       # GN version: //mojo/common:mojo_common_unittests
       'target_name': 'mojo_common_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
+        'mojo_common_lib',
+        'mojo_url_type_converters',
         '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_environment_chromium',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
-        'mojo_common_lib',
-        'mojo_environment_chromium',
-        'mojo_message_pump_lib',
-        'mojo_url_type_converters',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
-        'message_pump/handle_watcher_unittest.cc',
-        'message_pump/message_pump_mojo_unittest.cc',
+        'common/handle_watcher_unittest.cc',
+        'common/message_pump_mojo_unittest.cc',
       ],
     },
     {
       # GN version: //mojo/environment:chromium
       'target_name': 'mojo_environment_chromium',
       'type': 'static_library',
       'dependencies': [
         'mojo_environment_chromium_impl',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
+        'environment/environment.cc',
         # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
         "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h",
         "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc",
         "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
         "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
         "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
         "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
         "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",
-        'environment/environment.cc',
       ],
       'include_dirs': [
         '..',
         '../third_party/mojo/src',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/mojo/src',
         ],
       },
       'export_dependent_settings': [
         'mojo_environment_chromium_impl',
       ],
     },
     {
       # GN version: //mojo/environment:chromium_impl
       'target_name': 'mojo_environment_chromium_impl',
       'type': '<(component)',
       'defines': [
         'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_message_pump_lib',
+        'mojo_common_lib',
         '<(mojo_system_for_component)',
       ],
       'sources': [
         'environment/default_async_waiter_impl.cc',
         'environment/default_async_waiter_impl.h',
         'environment/default_logger_impl.cc',
         'environment/default_logger_impl.h',
         'environment/default_run_loop_impl.cc',
         'environment/default_run_loop_impl.h',
         'environment/default_task_tracker_impl.cc',
@@ skipping 50 matching lines @@
         'application/public/cpp/lib/service_connector_registry.cc',
         'application/public/cpp/lib/service_connector_registry.h',
         'application/public/cpp/lib/service_provider_impl.cc',
         'application/public/cpp/lib/service_registry.cc',
         'application/public/cpp/lib/service_registry.h',
         'application/public/cpp/service_connector.h',
         'application/public/cpp/service_provider_impl.h',
       ],
       'dependencies': [
         'mojo_application_bindings',
-        'mojo_message_pump_lib',
+        'mojo_common_lib',
       ],
     },
     {
       # GN version: //mojo/public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
       'dependencies': [
         'mojo_application_bindings_mojom',
         'mojo_services.gyp:network_service_bindings_lib',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ skipping 103 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'mojo_common_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }