Revert of Straightens outs DEPS in mojo/common

mojo/android/javatests/mojo_test_case.cc

 // 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.
 
 #include "mojo/android/javatests/mojo_test_case.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_support_android.h"
 #include "jni/MojoTestCase_jni.h"
-#include "mojo/message_pump/message_pump_mojo.h"
+#include "mojo/common/message_pump_mojo.h"
+
 #include "mojo/public/cpp/environment/environment.h"
 
 namespace {
 
 struct TestEnvironment {
   TestEnvironment() : message_loop(mojo::common::MessagePumpMojo::Create()) {}
 
   base::ShadowingAtExitManager at_exit;
   base::MessageLoop message_loop;
 };
@@ skipping 33 matching lines @@
     run_loop.RunUntilIdle();
   }
 }
 
 bool RegisterMojoTestCase(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo