Straightens outs DEPS in mojo/common

mojo/android/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("//build/config/android/rules.gni")
 
 group("android") {
   testonly = true
   deps = [
     ":system_java",
     ":mojo_javatests",
     ":mojo_test_apk",
   ]
 }
 
 generate_jni("jni_headers") {
   sources = [
     "javatests/src/org/chromium/mojo/MojoTestCase.java",
     "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java",
   ]
   deps = [
     ":system_java_jni_headers",
   ]
 
   jni_package = "mojo"
 }
 
 generate_jni("system_java_jni_headers") {
   sources = [
+    "system/src/org/chromium/mojo/system/impl/BaseRunLoop.java",
     "system/src/org/chromium/mojo/system/impl/CoreImpl.java",
-    "system/src/org/chromium/mojo/system/impl/BaseRunLoop.java",
   ]
 
   jni_package = "mojo"
 }
 
 source_set("libsystem_java") {
   sources = [
     "system/base_run_loop.cc",
     "system/base_run_loop.h",
     "system/core_impl.cc",
     "system/core_impl.h",
   ]
 
   deps = [
     ":system_java_jni_headers",
     "//base",
     "//mojo/environment:chromium",
-    "//mojo/common:common",
+    "//mojo/message_pump",
     "//third_party/mojo/src/mojo/edk/system",
     "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
 }
 
 android_library("system_java") {
   java_files = [
     "system/src/org/chromium/mojo/system/impl/BaseRunLoop.java",
     "system/src/org/chromium/mojo/system/impl/CoreImpl.java",
     "system/src/org/chromium/mojo/system/impl/DataPipeConsumerHandleImpl.java",
@@ skipping 58 matching lines @@
     "javatests/validation_test_util.cc",
     "javatests/validation_test_util.h",
   ]
 
   deps = [
     ":jni_headers",
     ":libsystem_java",
     ":system_java_jni_headers",
     "//base",
     "//base/test/:test_support",
-    "//mojo/common",
+    "//mojo/message_pump",
     "//third_party/mojo/src/mojo/edk/system",
     "//third_party/mojo/src/mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
     "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
     "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
   defines = [ "UNIT_TEST" ]
 }
 
 android_apk("mojo_test_apk") {
   testonly = true
   deps = [
     ":mojo_javatests",
     ":mojo_java_unittests",
     ":system_java",
     "//base:base_java",
     "//third_party/mojo/src/mojo/public/java:bindings",
     "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
   native_libs = [ "libmojo_java_unittests.so" ]
   apk_name = "MojoTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }