Revert of Straightens outs DEPS in mojo/common

mojo/common/BUILD.gn

 # 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.
 
 import("//testing/test.gni")
 
 group("common") {
   deps = [
     ":common_base",
     ":url_type_converters",
   ]
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_common_lib
 component("common_base") {
   output_name = "mojo_common_lib"
 
   sources = [
     "common_type_converters.cc",
     "common_type_converters.h",
     "data_pipe_file_utils.cc",
     "data_pipe_utils.cc",
     "data_pipe_utils.h",
+    "handle_watcher.cc",
+    "handle_watcher.h",
+    "message_pump_mojo.cc",
+    "message_pump_mojo.h",
+    "message_pump_mojo_handler.h",
+    "time_helper.cc",
+    "time_helper.h",
     "user_agent.cc",
     "user_agent.h",
     "weak_binding_set.h",
     "weak_interface_ptr_set.h",
   ]
 
   defines = [ "MOJO_COMMON_IMPLEMENTATION" ]
 
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//third_party/mojo/src/mojo/public/cpp/environment",
-    "//third_party/mojo/src/mojo/public/cpp/system",
   ]
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_url_type_converters
 source_set("url_type_converters") {
   sources = [
     "url_type_converters.cc",
     "url_type_converters.h",
   ]
 
@@ skipping 18 matching lines @@
 }
 
 # GYP version: mojo/mojo_base.gyp:mojo_common_unittests
 test("mojo_common_unittests") {
   deps = [
     ":common",
     "//base",
     "//base:message_loop_tests",
     "//base/test:test_support",
     "//mojo/environment:chromium",
-    "//mojo/message_pump",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//third_party/mojo/src/mojo/edk/test:test_support",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
     "//url",
   ]
 
   sources = [
-    # The message_pump tests are so small and some what related to this code
-    # that we put them here.
-    "../message_pump/handle_watcher_unittest.cc",
-    "../message_pump/message_pump_mojo_unittest.cc",
     "common_type_converters_unittest.cc",
+    "handle_watcher_unittest.cc",
+    "message_pump_mojo_unittest.cc",
   ]
 }
 
 if (!is_component_build) {
   source_set("tracing_impl") {
     sources = [
       "trace_controller_impl.cc",
       "trace_controller_impl.h",
       "tracing_impl.cc",
       "tracing_impl.h",
     ]
 
     deps = [
       "//base",
       "//mojo/application/public/cpp",
       "//mojo/services/tracing:bindings",
       "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
   }
 }