Reland: Web MIDI: split build rules for media/midi

Changes from the first coommit.
- Define right dependencies to xdisplaycheck
- Fix build rules for midi_unittests_apk to run on Android
- Rebase error fixes (build rule deopendency adjustments)

Original commit is:
https://crrev.com/31624cad1a3b5cf26950b864837ba44b3aa38331

Original description follows:

Split MIDI related stuffs from media as a component in build files.
Also, MIDI related unit tests are split into midi_unittests.

BUG=475869
TEST=git cl try
TEST=ninja midi_unittests_apk && ./build/android/test_runner.py gtest midi_unittests

Review URL: https://codereview.chromium.org/1065743003

Cr-Commit-Position: refs/heads/master@{#327712}

1 files changed, 29 insertions, 0 deletions

diff --git a/media/midi/midi_jni_registrar.cc b/media/midi/midi_jni_registrar.cc
new file mode 100644
index 0000000..a0028cd
--- /dev/null
+++ b/media/midi/midi_jni_registrar.cc
@@ -0,0 +1,29 @@
+// Copyright 2015 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 "media/midi/midi_jni_registrar.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
+#include "base/basictypes.h"
+
+#include "media/midi/usb_midi_device_android.h"
+#include "media/midi/usb_midi_device_factory_android.h"
+
+namespace media {
+namespace midi {
+
+static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
+    {"UsbMidiDevice", UsbMidiDeviceAndroid::RegisterUsbMidiDevice},
+    {"UsbMidiDeviceFactory",
+     UsbMidiDeviceFactoryAndroid::RegisterUsbMidiDeviceFactory},
+};
+
+bool RegisterJni(JNIEnv* env) {
+  return base::android::RegisterNativeMethods(
+      env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
+}
+
+}  // namespace midi
+}  // namespace media