From e982228691b6505148be90a9ce511f864f3020e0 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 12 Sep 2014 22:46:39 -0400
Subject: [PATCH] Bug 1020564 - Fix a bad rebase r=me

---
 mobile/android/base/tests/testVideoDiscovery.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/tests/testVideoDiscovery.js b/mobile/android/base/tests/testVideoDiscovery.js
index fbfed579ff5b..398d5daad9df 100644
--- a/mobile/android/base/tests/testVideoDiscovery.js
+++ b/mobile/android/base/tests/testVideoDiscovery.js
@@ -27,8 +27,8 @@ function middle(element) {
   return [x, y];
 }
 
-// We must register a target and make a "mock" service for the target
-var testTarget = {
+// We must register a device and make a "mock" service for the device
+var testDevice = {
   id: "test:dummy",
   target: "test:service",
   factory: function(service) { /* dummy */  },
@@ -42,11 +42,11 @@ add_test(function setup_browser() {
 
   do_register_cleanup(function cleanup() {
     BrowserApp.closeTab(BrowserApp.getTabForBrowser(browser));
-    SimpleServiceDiscovery.unregisterTarget(testTarget);
+    SimpleServiceDiscovery.unregisterDevice(testDevice);
   });
 
-  // We need to register a target or processService will ignore us
-  SimpleServiceDiscovery.registerTarget(testTarget);
+  // We need to register a device or processService will ignore us
+  SimpleServiceDiscovery.registerDevice(testDevice);
 
   // Create a pretend service
   let service = {