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

media/midi/usb_midi_device_factory_android.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 "media/midi/usb_midi_device_factory_android.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "jni/UsbMidiDeviceFactoryAndroid_jni.h"
 #include "media/midi/usb_midi_device_android.h"
 
 namespace media {
+namespace midi {
 
 namespace {
 
 typedef UsbMidiDevice::Factory::Callback Callback;
 
 }  // namespace
 
 UsbMidiDeviceFactoryAndroid::UsbMidiDeviceFactoryAndroid() : delegate_(NULL) {}
 
 UsbMidiDeviceFactoryAndroid::~UsbMidiDeviceFactoryAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!raw_factory_.is_null())
-    midi::Java_UsbMidiDeviceFactoryAndroid_close(
+    Java_UsbMidiDeviceFactoryAndroid_close(
         env, raw_factory_.obj(), base::android::GetApplicationContext());
 }
 
 void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
     UsbMidiDeviceDelegate* delegate,
     Callback callback) {
   DCHECK(!delegate_);
   JNIEnv* env = base::android::AttachCurrentThread();
   uintptr_t pointer = reinterpret_cast<uintptr_t>(this);
-  raw_factory_.Reset(midi::Java_UsbMidiDeviceFactoryAndroid_create(
+  raw_factory_.Reset(Java_UsbMidiDeviceFactoryAndroid_create(
       env, base::android::GetApplicationContext(), pointer));
 
   delegate_ = delegate;
   callback_ = callback;
 
-  if (midi::Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
+  if (Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
           env, raw_factory_.obj(), base::android::GetApplicationContext())) {
     // Asynchronous operation.
     return;
   }
   // No devices are found.
   ScopedVector<UsbMidiDevice> devices;
   callback.Run(true, &devices);
 }
 
 // Called from the Java world.
@@ skipping 25 matching lines @@
 
 // Called from the Java world.
 void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceDetached(
     JNIEnv* env,
     jobject caller,
     jint index) {
   delegate_->OnDeviceDetached(index);
 }
 
 bool UsbMidiDeviceFactoryAndroid::RegisterUsbMidiDeviceFactory(JNIEnv* env) {
-  return midi::RegisterNativesImpl(env);
+  return RegisterNativesImpl(env);
 }
 
+}  // namespace midi
 }  // namespace media