Web MIDI: namespace change from media to media::midi

media/midi/usb_midi_device_android.cc

Index: media/midi/usb_midi_device_android.cc
diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc
index 640ef22278be020a953e4b3ea79279b184de9fdc..033f32431359d316b6f2d360d3dcfa52961ccff7 100644
--- a/media/midi/usb_midi_device_android.cc
+++ b/media/midi/usb_midi_device_android.cc
@@ -15,12 +15,13 @@
 #include "media/midi/usb_midi_descriptor_parser.h"
 
 namespace media {
+namespace midi {
 
 UsbMidiDeviceAndroid::UsbMidiDeviceAndroid(ObjectRef raw_device,
                                            UsbMidiDeviceDelegate* delegate)
     : raw_device_(raw_device), delegate_(delegate) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  midi::Java_UsbMidiDeviceAndroid_registerSelf(env, raw_device_.obj(),
+  Java_UsbMidiDeviceAndroid_registerSelf(env, raw_device_.obj(),
                                                reinterpret_cast<jlong>(this));

[yhirano, 2015/05/01 07:41:43]

indent

 
   GetDescriptorsInternal();
@@ -29,7 +30,7 @@ UsbMidiDeviceAndroid::UsbMidiDeviceAndroid(ObjectRef raw_device,
 
 UsbMidiDeviceAndroid::~UsbMidiDeviceAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  midi::Java_UsbMidiDeviceAndroid_close(env, raw_device_.obj());
+  Java_UsbMidiDeviceAndroid_close(env, raw_device_.obj());
 }
 
 std::vector<uint8> UsbMidiDeviceAndroid::GetDescriptors() {
@@ -55,7 +56,7 @@ void UsbMidiDeviceAndroid::Send(int endpoint_number,
   ScopedJavaLocalRef<jbyteArray> data_to_pass =
       base::android::ToJavaByteArray(env, head, data.size());
 
-  midi::Java_UsbMidiDeviceAndroid_send(env, raw_device_.obj(), endpoint_number,
+  Java_UsbMidiDeviceAndroid_send(env, raw_device_.obj(), endpoint_number,
                                        data_to_pass.obj());

[yhirano, 2015/05/01 07:41:43]

indent

 }
 
@@ -72,13 +73,13 @@ void UsbMidiDeviceAndroid::OnData(JNIEnv* env,
 }
 
 bool UsbMidiDeviceAndroid::RegisterUsbMidiDevice(JNIEnv* env) {
-  return midi::RegisterNativesImpl(env);
+  return RegisterNativesImpl(env);
 }
 
 void UsbMidiDeviceAndroid::GetDescriptorsInternal() {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jbyteArray> descriptors =
-      midi::Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_.obj());
+      Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_.obj());
 
   base::android::JavaByteArrayToByteVector(env, descriptors.obj(),
                                            &descriptors_);
@@ -111,7 +112,7 @@ void UsbMidiDeviceAndroid::InitDeviceInfo() {
 std::vector<uint8> UsbMidiDeviceAndroid::GetStringDescriptor(int index) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jbyteArray> descriptors =
-      midi::Java_UsbMidiDeviceAndroid_getStringDescriptor(
+      Java_UsbMidiDeviceAndroid_getStringDescriptor(
           env, raw_device_.obj(), index);
 
   std::vector<uint8> ret;
@@ -142,4 +143,5 @@ std::string UsbMidiDeviceAndroid::GetString(int index,
   return result;
 }
 
+}  // namespace midi
 }  // namespace media