From 41a877e7a53b126cf288644b48c6e40f2574660a Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 2 Jun 2014 10:41:57 -0400 Subject: [PATCH] bug 815002 - fix browser_device_get_user_media.js to work with --use-test-media-devices. r=florian --- .../general/browser_devices_get_user_media.js | 4 ++-- .../content/test/general/get_user_media.html | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/browser/base/content/test/general/browser_devices_get_user_media.js b/browser/base/content/test/general/browser_devices_get_user_media.js index baf877452190..1ec3bdcae34d 100644 --- a/browser/base/content/test/general/browser_devices_get_user_media.js +++ b/browser/base/content/test/general/browser_devices_get_user_media.js @@ -60,7 +60,7 @@ function expectNoObserverCalled() { if (gObservedTopics[topic]) is(gObservedTopics[topic], 0, topic + " notification unexpected"); } - gObservedTopics = {} + gObservedTopics = {}; } function promiseMessage(aMessage, aAction) { @@ -816,7 +816,7 @@ function test() { finish(); }); }, true); - let rootDir = getRootDirectory(gTestPath) + let rootDir = getRootDirectory(gTestPath); rootDir = rootDir.replace("chrome://mochitests/content/", "https://example.com/"); content.location = rootDir + "get_user_media.html"; diff --git a/browser/base/content/test/general/get_user_media.html b/browser/base/content/test/general/get_user_media.html index 7c444f333881..3123e3573876 100644 --- a/browser/base/content/test/general/get_user_media.html +++ b/browser/base/content/test/general/get_user_media.html @@ -4,6 +4,19 @@