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

media/midi/usb_midi_device_factory_android.cc

Index: media/midi/usb_midi_device_factory_android.cc
diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc
index 6302572f9332a2050b440c9b59447589a67dfd67..f0664285a58e2349e465c0b977a8410de4b3a8e9 100644
--- a/media/midi/usb_midi_device_factory_android.cc
+++ b/media/midi/usb_midi_device_factory_android.cc
@@ -30,7 +30,7 @@ UsbMidiDeviceFactoryAndroid::UsbMidiDeviceFactoryAndroid() : delegate_(NULL) {}
 UsbMidiDeviceFactoryAndroid::~UsbMidiDeviceFactoryAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!raw_factory_.is_null())
-    Java_UsbMidiDeviceFactoryAndroid_close(
+    midi::Java_UsbMidiDeviceFactoryAndroid_close(

[DaleCurtis, 2015/04/20 16:23:37]

Do you want to point everything inside midi dir in midi namespace?

[Takashi Toyoshima, 2015/04/21 06:50:46]

I'm planning to move everything under media/midi into media::midi namespace
after this CL. At that time, I'll remove these midi:: namespace prefixes.

         env, raw_factory_.obj(), base::android::GetApplicationContext());
 }
 
@@ -40,13 +40,13 @@ void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
   DCHECK(!delegate_);
   JNIEnv* env = base::android::AttachCurrentThread();
   uintptr_t pointer = reinterpret_cast<uintptr_t>(this);
-  raw_factory_.Reset(Java_UsbMidiDeviceFactoryAndroid_create(
+  raw_factory_.Reset(midi::Java_UsbMidiDeviceFactoryAndroid_create(
       env, base::android::GetApplicationContext(), pointer));
 
   delegate_ = delegate;
   callback_ = callback;
 
-  if (Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
+  if (midi::Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
           env, raw_factory_.obj(), base::android::GetApplicationContext())) {
     // Asynchronous operation.
     return;
@@ -92,7 +92,7 @@ void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceDetached(
 }
 
 bool UsbMidiDeviceFactoryAndroid::RegisterUsbMidiDeviceFactory(JNIEnv* env) {
-  return RegisterNativesImpl(env);
+  return midi::RegisterNativesImpl(env);
 }
 
 }  // namespace media