Bug 1075091 - Rename Firefly code to Matchstick. r=wesj

--HG--
rename : mobile/android/modules/FireflyApp.jsm => mobile/android/modules/MatchstickApp.jsm

mobile/android/base/MediaPlayerManager.java

@@ -127,7 +127,7 @@ class MediaPlayerManager implements NativeEventListener,
                     }
                 } catch(Exception ex) {
                     // This may happen if the device isn't a real Chromecast,
-                    // for example Firefly casting devices.
+                    // for example Matchstick casting devices.
                     Log.e(LOGTAG, "Couldn't create JSON for display", ex);
                 }
             }

mobile/android/chrome/content/CastingApps.js

@@ -21,16 +21,16 @@ var rokuDevice = {
   extensions: ["mp4"]
 };
 
-var fireflyDevice = {
-  id: "firefly:dial",
+var matchstickDevice = {
+  id: "matchstick:dial",
   target: "urn:dial-multiscreen-org:service:dial:1",
   filters: {
     server: null,
     modelName: "Eureka Dongle"
   },
   factory: function(aService) {
-    Cu.import("resource://gre/modules/FireflyApp.jsm");
-    return new FireflyApp(aService);
+    Cu.import("resource://gre/modules/MatchstickApp.jsm");
+    return new MatchstickApp(aService);
   },
   types: ["video/mp4", "video/webm"],
   extensions: ["mp4", "webm"]
@@ -59,7 +59,7 @@ var CastingApps = {
 
     // Register targets
     SimpleServiceDiscovery.registerDevice(rokuDevice);
-    SimpleServiceDiscovery.registerDevice(fireflyDevice);
+    SimpleServiceDiscovery.registerDevice(matchstickDevice);
     SimpleServiceDiscovery.registerDevice(mediaPlayerDevice);
 
     // Search for devices continuously every 120 seconds

mobile/android/modules/MatchstickApp.jsm

@@ -5,7 +5,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["FireflyApp"];
+this.EXPORTED_SYMBOLS = ["MatchstickApp"];
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
@@ -106,12 +106,12 @@ const PLAYER_STATUS_STOP = 4;
 const PLAYER_STATUS_IDLE = 5;
 const PLAYER_STATUS_BUFFERING = 6;
 
-function FireflyApp(service) {
+function MatchstickApp(service) {
   let uri = Services.io.newURI(service.location, null, null);
   this._ip = uri.host;
 };
 
-FireflyApp.prototype = {
+MatchstickApp.prototype = {
   _ip: null,
   _port: 8888,
   _cmd_socket: null,

mobile/android/modules/moz.build

@@ -9,12 +9,12 @@ EXTRA_JS_MODULES += [
     'AndroidLog.jsm',
     'ContactService.jsm',
     'dbg-browser-actors.js',
-    'FireflyApp.jsm',
     'HelperApps.jsm',
     'Home.jsm',
     'HomeProvider.jsm',
     'JNI.jsm',
     'LightweightThemeConsumer.jsm',
+    'MatchstickApp.jsm',
     'MediaPlayerApp.jsm',
     'Messaging.jsm',
     'NetErrorHelper.jsm',