Backed out changeset 80bf024e03d6 (bug 1054920) for robocop-5 and S4 orange

mobile/android/chrome/content/CastingApps.js

@@ -458,10 +458,6 @@ var CastingApps = {
       }
     });
 
-    if (items.length == 0) {
-      return;
-    }
-
     let prompt = new Prompt({
       title: Strings.browser.GetStringFromName("casting.prompt")
     }).setSingleChoiceItems(items).show(function(data) {

mobile/android/modules/SimpleServiceDiscovery.jsm

@@ -246,8 +246,8 @@ var SimpleServiceDiscovery = {
 
   getSupportedExtensions: function() {
     let extensions = [];
-    this.services.forEach(function(service) {
-        extensions = extensions.concat(service.extensions);
+    this._targets.forEach(function(target) {
+        extensions = extensions.concat(target.extensions);
       }, this);
     return extensions.filter(function(extension, pos) {
       return extensions.indexOf(extension) == pos;
@@ -256,8 +256,8 @@ var SimpleServiceDiscovery = {
 
   getSupportedMimeTypes: function() {
     let types = [];
-    this.services.forEach(function(service) {
-        types = types.concat(service.types);
+    this._targets.forEach(function(target) {
+        types = types.concat(target.types);
       }, this);
     return types.filter(function(type, pos) {
       return types.indexOf(type) == pos;