From e4a2bde04b628db3a23fb293fcd7198f562a59d9 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 9 Aug 2016 12:18:13 -0700
Subject: [PATCH] Bug 1291833 - remove little-used gWebRTCUI symbol in favor of
 natural module export. r=MattN

---
 browser/base/content/browser.js                               | 4 ++--
 browser/base/content/popup-notifications.inc                  | 2 +-
 .../content/test/webrtc/browser_devices_get_user_media.js     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e65491e231fc..df8e297f12e7 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -194,8 +194,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",
 XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
   "resource://gre/modules/FxAccounts.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "gWebRTCUI",
-  "resource:///modules/webrtcUI.jsm", "webrtcUI");
+XPCOMUtils.defineLazyModuleGetter(this, "webrtcUI",
+  "resource:///modules/webrtcUI.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler",
   "resource:///modules/ContentCrashHandlers.jsm");
diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc
index b446e17580ef..1d482526b677 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -22,7 +22,7 @@
         <label id="webRTC-selectWindow-label"
                control="webRTC-selectWindow-menulist"/>
         <menulist id="webRTC-selectWindow-menulist"
-                  oncommand="gWebRTCUI.updateMainActionLabel(this);">
+                  oncommand="webrtcUI.updateMainActionLabel(this);">
           <menupopup id="webRTC-selectWindow-menupopup"/>
         </menulist>
         <description id="webRTC-all-windows-shared" hidden="true">&getUserMedia.allWindowsShared.message;</description>
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media.js b/browser/base/content/test/webrtc/browser_devices_get_user_media.js
index 33b5874099c8..103b3173f181 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media.js
@@ -492,8 +492,8 @@ var gTests = [
 
     yield promisePopupNotificationShown("webRTC-sharingDevices", () => {
       if ("nsISystemStatusBar" in Ci) {
-        let activeStreams = gWebRTCUI.getActiveStreams(true, false, false);
-        gWebRTCUI.showSharingDoorhanger(activeStreams[0], "Devices");
+        let activeStreams = webrtcUI.getActiveStreams(true, false, false);
+        webrtcUI.showSharingDoorhanger(activeStreams[0], "Devices");
       }
       else {
         let win =