//media/midi: use top level namespace midi rather than media.midi

media/midi/java/src/org/chromium/media/midi/MidiManagerAndroid.java

Index: media/midi/java/src/org/chromium/media/midi/MidiManagerAndroid.java
diff --git a/media/midi/java/src/org/chromium/media/midi/MidiManagerAndroid.java b/media/midi/java/src/org/chromium/media/midi/MidiManagerAndroid.java
deleted file mode 100644
index 32f0e8670e09a1afc702e52775905d3730b4fd35..0000000000000000000000000000000000000000
--- a/media/midi/java/src/org/chromium/media/midi/MidiManagerAndroid.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// 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.
-
-package org.chromium.media.midi;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.media.midi.MidiDevice;
-import android.media.midi.MidiDeviceInfo;
-import android.media.midi.MidiManager;
-import android.os.Build;
-import android.os.Handler;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A Java class implementing media::midi::MidiManagerAndroid functionality.
- */
-@JNINamespace("media::midi")
-@TargetApi(Build.VERSION_CODES.M)
-class MidiManagerAndroid {
-    /**
-     * Set true when this instance is successfully initialized.
-     */
-    private boolean mIsInitialized = false;
-    /**
-     * The devices held by this manager.
-     */
-    private final List<MidiDeviceAndroid> mDevices = new ArrayList<>();
-    /**
-     * The device information instances which are being initialized.
-     */
-    private final Set<MidiDeviceInfo> mPendingDevices = new HashSet<>();
-    /**
-     * The underlying MidiManager.
-     */
-    private final MidiManager mManager;
-    /**
-     * Callbacks will run on the message queue associated with this handler.
-     */
-    private final Handler mHandler;
-    /**
-     * The associated media::midi::MidiDeviceAndroid instance.
-     */
-    private final long mNativeManagerPointer;
-
-    /**
-     * A creation function called by C++.
-     * @param context
-     * @param nativeManagerPointer The native pointer to a media::midi::MidiManagerAndroid object.
-     */
-    @CalledByNative
-    static MidiManagerAndroid create(Context context, long nativeManagerPointer) {
-        return new MidiManagerAndroid(context, nativeManagerPointer);
-    }
-
-    /**
-     * @param context
-     * @param nativeManagerPointer The native pointer to a media::midi::MidiManagerAndroid object.
-     */
-    private MidiManagerAndroid(Context context, long nativeManagerPointer) {
-        assert ThreadUtils.runningOnUiThread();
-
-        mManager = (MidiManager) context.getSystemService(Context.MIDI_SERVICE);
-        mHandler = new Handler(ThreadUtils.getUiThreadLooper());
-        mNativeManagerPointer = nativeManagerPointer;
-    }
-
-    /**
-     * Initializes this object.
-     * This function must be called right after creation.
-     */
-    @CalledByNative
-    void initialize() {
-        if (mManager == null) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    nativeOnInitializationFailed(mNativeManagerPointer);
-                }
-            });
-            return;
-        }
-        mManager.registerDeviceCallback(new MidiManager.DeviceCallback() {
-            @Override
-            public void onDeviceAdded(MidiDeviceInfo device) {
-                MidiManagerAndroid.this.onDeviceAdded(device);
-            }
-
-            @Override
-            public void onDeviceRemoved(MidiDeviceInfo device) {
-                MidiManagerAndroid.this.onDeviceRemoved(device);
-            }
-        }, mHandler);
-        MidiDeviceInfo[] infos = mManager.getDevices();
-
-        for (final MidiDeviceInfo info : infos) {
-            mPendingDevices.add(info);
-            openDevice(info);
-        }
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (mPendingDevices.isEmpty() && !mIsInitialized) {
-                    nativeOnInitialized(
-                            mNativeManagerPointer, mDevices.toArray(new MidiDeviceAndroid[0]));
-                    mIsInitialized = true;
-                }
-            }
-        });
-    }
-
-    private void openDevice(final MidiDeviceInfo info) {
-        mManager.openDevice(info, new MidiManager.OnDeviceOpenedListener() {
-            @Override
-            public void onDeviceOpened(MidiDevice device) {
-                MidiManagerAndroid.this.onDeviceOpened(device, info);
-            }
-        }, mHandler);
-    }
-
-    /**
-     * Called when a midi device is attached.
-     * @param info the attached device information.
-     */
-    private void onDeviceAdded(final MidiDeviceInfo info) {
-        if (!mIsInitialized) {
-            mPendingDevices.add(info);
-        }
-        openDevice(info);
-    }
-
-    /**
-     * Called when a midi device is detached.
-     * @param info the detached device information.
-     */
-    private void onDeviceRemoved(MidiDeviceInfo info) {
-        for (MidiDeviceAndroid device : mDevices) {
-            if (device.isOpen() && device.getInfo().getId() == info.getId()) {
-                device.close();
-                nativeOnDetached(mNativeManagerPointer, device);
-            }
-        }
-    }
-
-    private void onDeviceOpened(MidiDevice device, MidiDeviceInfo info) {
-        mPendingDevices.remove(info);
-        if (device != null) {
-            MidiDeviceAndroid xdevice = new MidiDeviceAndroid(device);
-            mDevices.add(xdevice);
-            if (mIsInitialized) {
-                nativeOnAttached(mNativeManagerPointer, xdevice);
-            }
-        }
-        if (!mIsInitialized && mPendingDevices.isEmpty()) {
-            nativeOnInitialized(mNativeManagerPointer, mDevices.toArray(new MidiDeviceAndroid[0]));
-            mIsInitialized = true;
-        }
-    }
-
-    static native void nativeOnInitialized(
-            long nativeMidiManagerAndroid, MidiDeviceAndroid[] devices);
-    static native void nativeOnInitializationFailed(long nativeMidiManagerAndroid);
-    static native void nativeOnAttached(long nativeMidiManagerAndroid, MidiDeviceAndroid device);
-    static native void nativeOnDetached(long nativeMidiManagerAndroid, MidiDeviceAndroid device);
-}