Bug 1078796 - Remove special purpose Matchstick filtering code r=wesj

mobile/android/chrome/content/CastingApps.js

@@ -25,8 +25,7 @@ var matchstickDevice = {
   id: "matchstick:dial",
   target: "urn:dial-multiscreen-org:service:dial:1",
   filters: {
-    server: null,
-    modelName: "Eureka Dongle"
+    manufacturer: "openflint"
   },
   factory: function(aService) {
     Cu.import("resource://gre/modules/MatchstickApp.jsm");

toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm

@@ -87,19 +87,12 @@ var SimpleServiceDiscovery = {
         service.location = row.substr(10).trim();
       } else if (name.startsWith("ST")) {
         service.target = row.substr(4).trim();
-      } else if (name.startsWith("SERVER")) {
-        service.server = row.substr(8).trim();
       }
     }.bind(this));
 
     if (service.location && service.target) {
       service.location = this._forceTrailingSlash(service.location);
 
-      // We add the server as an additional way to filter services
-      if (!("server" in service)) {
-        service.server = null;
-      }
-
       // When we find a valid response, package up the service information
       // and pass it on.
       try {