Bug 1062112: Part 3: Move GeckoMediaPlayer. r=nalexander

mobile/android/base/GeckoMediaPlayer.java

@@ -0,0 +1,22 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import org.json.JSONObject;
+import org.mozilla.gecko.util.EventCallback;
+
+/* Wrapper for MediaRouter types supported by Android, such as Chromecast, Miracast, etc. */
+interface GeckoMediaPlayer {
+    JSONObject toJSON();
+    void load(String title, String url, String type, EventCallback callback);
+    void play(EventCallback callback);
+    void pause(EventCallback callback);
+    void stop(EventCallback callback);
+    void start(EventCallback callback);
+    void end(EventCallback callback);
+    void mirror(EventCallback callback);
+    void message(String message, EventCallback callback);
+}

mobile/android/base/MediaPlayerManager.java

@@ -27,19 +27,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Iterator;
 
-/* Wraper for different MediaRouter types supproted by Android. i.e. Chromecast, Miracast, etc. */
-interface GeckoMediaPlayer {
-    public JSONObject toJSON();
-    public void load(String title, String url, String type, EventCallback callback);
-    public void play(EventCallback callback);
-    public void pause(EventCallback callback);
-    public void stop(EventCallback callback);
-    public void start(EventCallback callback);
-    public void end(EventCallback callback);
-    public void mirror(EventCallback callback);
-    public void message(String message, EventCallback callback);
-}
-
 /* Manages a list of GeckoMediaPlayers methods (i.e. Chromecast/Miracast). Routes messages
  * from Gecko to the correct caster based on the id of the display
  */

mobile/android/base/moz.build

@@ -520,6 +520,7 @@ moz_native_devices_jars = [
 ]
 moz_native_devices_sources = [
     'ChromeCast.java',
+    'GeckoMediaPlayer.java',
     'MediaPlayerManager.java',
 ]
 if CONFIG['MOZ_NATIVE_DEVICES']: