From c63bcc380cdadbc9eabb3dabba445c19c67be027 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Tue, 6 May 2014 14:32:54 -0700
Subject: [PATCH 01/11] Bug 1006805 - Simplify HardwareUtils. r=mfinkle

---
 mobile/android/base/util/HardwareUtils.java | 80 ++++++++++-----------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/mobile/android/base/util/HardwareUtils.java b/mobile/android/base/util/HardwareUtils.java
index 632e5c6dcd2..254d2a90cb3 100644
--- a/mobile/android/base/util/HardwareUtils.java
+++ b/mobile/android/base/util/HardwareUtils.java
@@ -5,6 +5,10 @@
 
 package org.mozilla.gecko.util;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -12,12 +16,6 @@ import android.os.Build;
 import android.util.Log;
 import android.view.ViewConfiguration;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public final class HardwareUtils {
     private static final String LOGTAG = "GeckoHardwareUtils";
 
@@ -34,66 +32,66 @@ public final class HardwareUtils {
 
     private static volatile int sTotalRAM = -1;
 
-    private static Context sContext;
+    private static volatile boolean sInited;
 
-    private static Boolean sIsLargeTablet;
-    private static Boolean sIsSmallTablet;
-    private static Boolean sIsTelevision;
-    private static Boolean sHasMenuButton;
+    // These are all set once, during init.
+    private static volatile boolean sIsLargeTablet;
+    private static volatile boolean sIsSmallTablet;
+    private static volatile boolean sIsTelevision;
+    private static volatile boolean sHasMenuButton;
 
     private HardwareUtils() {
     }
 
     public static void init(Context context) {
-        if (sContext != null) {
-            Log.w(LOGTAG, "HardwareUtils.init called twice!");
+        if (sInited) {
+            // This is unavoidable, given that HardwareUtils is called from background services.
+            Log.d(LOGTAG, "HardwareUtils already inited.");
+            return;
         }
-        sContext = context;
+
+        // Pre-populate common flags from the context.
+        final int screenLayoutSize = context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+        if (Build.VERSION.SDK_INT >= 11) {
+            sHasMenuButton = false;
+            if (screenLayoutSize == Configuration.SCREENLAYOUT_SIZE_XLARGE) {
+                sIsLargeTablet = true;
+            } else if (screenLayoutSize == Configuration.SCREENLAYOUT_SIZE_LARGE) {
+                sIsSmallTablet = true;
+            }
+            if (Build.VERSION.SDK_INT >= 14) {
+                sHasMenuButton = ViewConfiguration.get(context).hasPermanentMenuKey();
+
+                if (Build.VERSION.SDK_INT >= 16) {
+                    if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+                        sIsTelevision = true;
+                    }
+                }
+            }
+        } else {
+            sHasMenuButton = true;
+        }
+
+        sInited = true;
     }
 
     public static boolean isTablet() {
-        return isLargeTablet() || isSmallTablet();
+        return sIsLargeTablet || sIsSmallTablet;
     }
 
     public static boolean isLargeTablet() {
-        if (sIsLargeTablet == null) {
-            int screenLayout = sContext.getResources().getConfiguration().screenLayout;
-            sIsLargeTablet = (Build.VERSION.SDK_INT >= 11 &&
-                              ((screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE));
-        }
         return sIsLargeTablet;
     }
 
     public static boolean isSmallTablet() {
-        if (sIsSmallTablet == null) {
-            int screenLayout = sContext.getResources().getConfiguration().screenLayout;
-            sIsSmallTablet = (Build.VERSION.SDK_INT >= 11 &&
-                              ((screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE));
-        }
         return sIsSmallTablet;
     }
 
     public static boolean isTelevision() {
-        if (Build.VERSION.SDK_INT < 16) {
-            // System feature not supported before Jelly Bean.
-            return false;
-        }
-        if (sIsTelevision == null) {
-            sIsTelevision = sContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION);
-        }
         return sIsTelevision;
     }
 
     public static boolean hasMenuButton() {
-        if (sHasMenuButton == null) {
-            sHasMenuButton = Boolean.TRUE;
-            if (Build.VERSION.SDK_INT >= 11) {
-                sHasMenuButton = Boolean.FALSE;
-            }
-            if (Build.VERSION.SDK_INT >= 14) {
-                sHasMenuButton = ViewConfiguration.get(sContext).hasPermanentMenuKey();
-            }
-        }
         return sHasMenuButton;
     }
 

From fbc5973a424903ec067aaf756762c12ff2a7c7c2 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Fri, 18 Apr 2014 15:01:56 -0400
Subject: [PATCH 02/11] bug 995777 - browser.properties: rename
 getUserMedia.videoDevice.prompt to reflect new string r=mfinkle

---
 mobile/android/chrome/content/WebrtcUI.js            |  4 ++--
 .../android/locales/en-US/chrome/browser.properties  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mobile/android/chrome/content/WebrtcUI.js b/mobile/android/chrome/content/WebrtcUI.js
index fd55ff569c1..81a65be8378 100644
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -197,8 +197,8 @@ var WebrtcUI = {
     if (videoDevices.length > 1 || audioDevices.length > 0) {
       // Only show the No Video option if there are also Audio devices to choose from
       if (audioDevices.length > 0)
-        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoDevice.none") ];
-      this._addDevicesToOptions(videoDevices, "videoDevice", options, extraItems);
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoSource.none") ];
+      this._addDevicesToOptions(videoDevices, "videoSource", options, extraItems);
     }
 
     if (audioDevices.length > 1 || videoDevices.length > 0) {
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index f0598416fca..1ae3cb38ba2 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -299,12 +299,12 @@ getUserMedia.shareMicrophone.message = Would you like to share your microphone w
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.shareRequest.label = Share
-getUserMedia.videoDevice.default = Camera %S
-getUserMedia.videoDevice.frontCamera = Front facing camera
-getUserMedia.videoDevice.backCamera = Back facing camera
-getUserMedia.videoDevice.none = No Video
-getUserMedia.videoDevice.tabShare = Choose a tab to stream
-getUserMedia.videoDevice.prompt = Video source
+getUserMedia.videoSource.default = Camera %S
+getUserMedia.videoSource.frontCamera = Front facing camera
+getUserMedia.videoSource.backCamera = Back facing camera
+getUserMedia.videoSource.none = No Video
+getUserMedia.videoSource.tabShare = Choose a tab to stream
+getUserMedia.videoSource.prompt = Video source
 getUserMedia.audioDevice.default = Microphone %S
 getUserMedia.audioDevice.none = No Audio
 getUserMedia.audioDevice.prompt = Microphone to use

From 6a48bf3ea1e1d0885d4c7570b3a584576f11c256 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 6 May 2014 14:40:05 -0400
Subject: [PATCH 03/11] bug 1006494 - SimpleServiceDiscovery shouldn't add a
 trailing slash to services' location r=mfinkle

---
 mobile/android/modules/SimpleServiceDiscovery.jsm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mobile/android/modules/SimpleServiceDiscovery.jsm b/mobile/android/modules/SimpleServiceDiscovery.jsm
index 0423f2967b8..4a53acd9abe 100644
--- a/mobile/android/modules/SimpleServiceDiscovery.jsm
+++ b/mobile/android/modules/SimpleServiceDiscovery.jsm
@@ -57,11 +57,10 @@ var SimpleServiceDiscovery = {
   _searchRepeat: Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer),
 
   _forceTrailingSlash: function(aURL) {
-    // Some devices add the trailing '/' and some don't. Let's make sure
-    // it's there for consistency.
-    if (!aURL.endsWith("/")) {
-      aURL += "/";
-    }
+    // Cleanup the URL to make it consistent across devices
+    try {
+      aURL = Services.io.newURI(aURL, null, null).spec;
+    } catch(e) {}
     return aURL;
   },
 

From 80da9e20fd5941f2fbd9e72debb4f4a648c66635 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 7 May 2014 09:58:18 +1000
Subject: [PATCH 04/11] Bug 1002914 (part 1) - refactor the chat window so it
 can be used by loop and social. r=mixedpuppy

---
 browser/base/content/browser-sets.inc         |  12 +-
 browser/base/content/browser-social.js        |  35 +---
 browser/base/content/socialchat.xml           | 157 +++++++-------
 .../test/social/browser_social_chatwindow.js  |  78 ++-----
 .../test/social/browser_social_errorPage.js   |  31 +++
 browser/base/content/test/social/head.js      |   4 -
 browser/modules/Chat.jsm                      | 191 ++++++++++++++++++
 browser/modules/moz.build                     |   1 +
 toolkit/components/social/MozSocialAPI.jsm    | 101 ++-------
 9 files changed, 354 insertions(+), 256 deletions(-)
 create mode 100644 browser/modules/Chat.jsm

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 89e6cb5b69d..9fa8c57df79 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -119,8 +119,8 @@
     <command id="Social:SharePage" oncommand="SocialShare.sharePage();" disabled="true"/>
     <command id="Social:ToggleSidebar" oncommand="SocialSidebar.toggleSidebar();" hidden="true"/>
     <command id="Social:ToggleNotifications" oncommand="Social.toggleNotifications();" hidden="true"/>
-    <command id="Social:FocusChat" oncommand="SocialChatBar.focus();" hidden="true" disabled="true"/>
     <command id="Social:Addons" oncommand="BrowserOpenAddonsMgr('addons://list/service');"/>
+    <command id="Chat:Focus" oncommand="Cu.import('resource:///modules/Chat.jsm', {}).Chat.focus(window);"/>
   </commandset>
 
   <commandset id="placesCommands">
@@ -380,7 +380,15 @@
 #endif
 
     <!--<key id="markPage" key="&markPageCmd.commandkey;" command="Social:TogglePageMark" modifiers="accel,shift"/>-->
-    <key id="focusChatBar" key="&social.chatBar.commandkey;" command="Social:FocusChat" modifiers="accel,shift"/>
+    <key id="focusChatBar" key="&social.chatBar.commandkey;" command="Chat:Focus"
+#ifdef XP_MACOSX
+# Sadly the devtools uses shift-accel-c on non-mac and alt-accel-c everywhere else
+# So we just use the other
+         modifiers="accel,shift"
+#else
+         modifiers="accel,alt"
+#endif
+    />
 
     <key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
 
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index bdfcec2cf4b..f7e4e186125 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -173,7 +173,6 @@ SocialUI = {
   _providersChanged: function() {
     SocialSidebar.clearProviderMenus();
     SocialSidebar.update();
-    SocialChatBar.update();
     SocialShare.populateProviderMenu();
     SocialStatus.populateToolbarPalette();
     SocialMarks.populateToolbarPalette();
@@ -301,39 +300,13 @@ SocialChatBar = {
   get chatbar() {
     return document.getElementById("pinnedchats");
   },
-  // Whether the chatbar is available for this window.  Note that in full-screen
-  // mode chats are available, but not shown.
-  get isAvailable() {
-    return SocialUI.enabled;
-  },
-  // Does this chatbar have any chats (whether minimized, collapsed or normal)
-  get hasChats() {
-    return !!this.chatbar.firstElementChild;
-  },
   openChat: function(aProvider, aURL, aCallback, aMode) {
-    this.update();
-    if (!this.isAvailable)
-      return false;
-    this.chatbar.openChat(aProvider, aURL, aCallback, aMode);
-    // We only want to focus the chat if it is as a result of user input.
-    let dwu = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                    .getInterface(Ci.nsIDOMWindowUtils);
-    if (dwu.isHandlingUserInput)
-      this.chatbar.focus();
+    // Until we refactor the tests we can't remove this.
+    // Reach into the social API.
+    let openChatWindow = Cu.import("resource://gre/modules/MozSocialAPI.jsm", {}).openChatWindow;
+    openChatWindow(window, aProvider, aURL, aCallback, aMode);
     return true;
   },
-  update: function() {
-    let command = document.getElementById("Social:FocusChat");
-    if (!this.isAvailable) {
-      this.chatbar.hidden = command.hidden = true;
-    } else {
-      this.chatbar.hidden = command.hidden = false;
-    }
-    command.setAttribute("disabled", command.hidden ? "true" : "false");
-  },
-  focus: function SocialChatBar_focus() {
-    this.chatbar.focus();
-  }
 }
 
 SocialFlyout = {
diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index 85537db8f0a..714d90d3701 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -30,50 +30,43 @@
 
     <implementation implements="nsIDOMEventListener">
       <constructor><![CDATA[
-        let Social = Components.utils.import("resource:///modules/Social.jsm", {}).Social;
         this.content.__defineGetter__("popupnotificationanchor",
                                       () => document.getAnonymousElementByAttribute(this, "anonid", "notification-icon"));
-        Social.setErrorListener(this.content, function(aBrowser) {
-          aBrowser.webNavigation.loadURI("about:socialerror?mode=compactInfo&origin=" +
-                                 encodeURIComponent(aBrowser.getAttribute("origin")),
-                                 null, null, null, null);
-        });
+
         if (!this.chatbar) {
           document.getAnonymousElementByAttribute(this, "anonid", "minimize").hidden = true;
           document.getAnonymousElementByAttribute(this, "anonid", "close").hidden = true;
         }
         let contentWindow = this.contentWindow;
+        // process this._callbacks, then set to null so the chatbox creator
+        // knows to make new callbacks immediately.
+        if (this._callbacks) {
+          for (let callback of this._callbacks) {
+            callback(this);
+          }
+          this._callbacks = null;
+        }
         this.addEventListener("DOMContentLoaded", function DOMContentLoaded(event) {
           if (event.target != this.contentDocument)
             return;
           this.removeEventListener("DOMContentLoaded", DOMContentLoaded, true);
           this.isActive = !this.minimized;
-          // process this._callbacks, then set to null so the chatbox creator
-          // knows to make new callbacks immediately.
-          if (this._callbacks) {
-            for (let callback of this._callbacks) {
-              if (callback)
-                callback(contentWindow);
-            }
-            this._callbacks = null;
-          }
-
-          // content can send a socialChatActivity event to have the UI update.
-          let chatActivity = function() {
-            this.setAttribute("activity", true);
-            if (this.chatbar)
-              this.chatbar.updateTitlebar(this);
-          }.bind(this);
-          contentWindow.addEventListener("socialChatActivity", chatActivity);
-          contentWindow.addEventListener("unload", function unload() {
-            contentWindow.removeEventListener("unload", unload);
-            contentWindow.removeEventListener("socialChatActivity", chatActivity);
-          });
+          this._deferredChatLoaded.resolve(this);
         }, true);
         if (this.src)
           this.setAttribute("src", this.src);
       ]]></constructor>
 
+      <field name="_deferredChatLoaded" readonly="true">
+        Promise.defer();
+      </field>
+
+      <property name="promiseChatLoaded">
+        <getter>
+          return this._deferredChatLoaded.promise;
+        </getter>
+      </property>
+
       <field name="content" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "content");
       </field>
@@ -133,7 +126,7 @@
           this.contentDocument.documentElement.dispatchEvent(evt);
         </setter>
       </property>
-      
+
       <method name="showNotifications">
         <body><![CDATA[
         PopupNotifications._reshowNotifications(this.content.popupnotificationanchor,
@@ -148,15 +141,7 @@
           aTarget.src = this.src;
           aTarget.content.setAttribute("origin", this.content.getAttribute("origin"));
           aTarget.content.popupnotificationanchor.className = this.content.popupnotificationanchor.className;
-          this.content.socialErrorListener.remove();
-          aTarget.content.socialErrorListener.remove();
           this.content.swapDocShells(aTarget.content);
-          Social.setErrorListener(this.content, function(aBrowser) {}); // 'this' will be destroyed soon.
-          Social.setErrorListener(aTarget.content, function(aBrowser) {
-            aBrowser.webNavigation.loadURI("about:socialerror?mode=compactInfo&origin=" +
-                                 encodeURIComponent(aBrowser.getAttribute("origin")),
-                                 null, null, null, null);
-          });
         ]]></body>
       </method>
 
@@ -186,31 +171,40 @@
 
       <method name="swapWindows">
         <body><![CDATA[
-        let provider = Social._getProviderFromOrigin(this.content.getAttribute("origin"));
+        let deferred = Promise.defer();
+        let title = this.getAttribute("label");
         if (this.chatbar) {
-          this.chatbar.detachChatbox(this, { "centerscreen": "yes" }, win => {
-            win.document.title = provider.name;
-          });
+          this.chatbar.detachChatbox(this, { "centerscreen": "yes" }).then(
+            chatbox => {
+              chatbox.contentWindow.document.title = title;
+              deferred.resolve(chatbox);
+            }
+          );
         } else {
           // attach this chatbox to the topmost browser window
-          let findChromeWindowForChats = Cu.import("resource://gre/modules/MozSocialAPI.jsm").findChromeWindowForChats;
-          let win = findChromeWindowForChats();
-          let chatbar = win.SocialChatBar.chatbar;
-          chatbar.openChat(provider, "about:blank", win => {
-            let cb = chatbar.selectedChat;
-            this.swapDocShells(cb);
+          let Chat = Cu.import("resource:///modules/Chat.jsm").Chat;
+          let win = Chat.findChromeWindowForChats();
+          let chatbar = win.document.getElementById("pinnedchats");
+          let origin = this.content.getAttribute("origin");
+          let cb = chatbar.openChat(origin, title, "about:blank");
+          cb.promiseChatLoaded.then(
+            () => {
+              this.swapDocShells(cb);
 
-            // chatboxForURL is a map of URL -> chatbox used to avoid opening
-            // duplicate chat windows. Ensure reattached chat windows aren't
-            // registered with about:blank as their URL, otherwise reattaching
-            // more than one chat window isn't possible.
-            chatbar.chatboxForURL.delete("about:blank");
-            chatbar.chatboxForURL.set(this.src, Cu.getWeakReference(cb));
+              // chatboxForURL is a map of URL -> chatbox used to avoid opening
+              // duplicate chat windows. Ensure reattached chat windows aren't
+              // registered with about:blank as their URL, otherwise reattaching
+              // more than one chat window isn't possible.
+              chatbar.chatboxForURL.delete("about:blank");
+              chatbar.chatboxForURL.set(this.src, Cu.getWeakReference(cb));
 
-            chatbar.focus();
-            this.close();
-          });
+              chatbar.focus();
+              this.close();
+              deferred.resolve(cb);
+            }
+          );
         }
+        return deferred.promise;
         ]]></body>
       </method>
 
@@ -510,7 +504,6 @@
       <method name="_remove">
         <parameter name="aChatbox"/>
         <body><![CDATA[
-          aChatbox.content.socialErrorListener.remove();
           this.removeChild(aChatbox);
           // child might have been collapsed.
           let menuitem = this.menuitemMap.get(aChatbox);
@@ -522,6 +515,11 @@
         ]]></body>
       </method>
 
+      <!-- XXX - we should remove this - it is currently used only by tests.
+           No-one has any business removing all chats.  Chat.jsm exposes a
+           method to close all chats from a specific origin which is all that
+           should be necessary.
+      -->
       <method name="removeAll">
         <body><![CDATA[
           this.selectedChat = null;
@@ -534,10 +532,11 @@
       </method>
 
       <method name="openChat">
-        <parameter name="aProvider"/>
+        <parameter name="aOrigin"/>
+        <parameter name="aTitle"/>
         <parameter name="aURL"/>
-        <parameter name="aCallback"/>
         <parameter name="aMode"/>
+        <parameter name="aCallback"/>
         <body><![CDATA[
           let cb = this.chatboxForURL.get(aURL);
           if (cb) {
@@ -546,30 +545,35 @@
               this.showChat(cb, aMode);
               if (aCallback) {
                 if (cb._callbacks == null) {
-                  // DOMContentLoaded has already fired, so callback now.
-                  aCallback(cb.contentWindow);
+                  // Chatbox has already been created, so callback now.
+                  aCallback(cb);
                 } else {
-                  // DOMContentLoaded for this chat is yet to fire...
+                  // Chatbox is yet to have bindings created...
                   cb._callbacks.push(aCallback);
                 }
               }
-              return;
+              return cb;
             }
             this.chatboxForURL.delete(aURL);
           }
           cb = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "chatbox");
-          // _callbacks is a javascript property instead of a <field> as it
-          // must exist before the (possibly delayed) bindings are created.
-          cb._callbacks = [aCallback];
+          cb._callbacks = [];
+          if (aCallback) {
+            // _callbacks is a javascript property instead of a <field> as it
+            // must exist before the (possibly delayed) bindings are created.
+            cb._callbacks.push(aCallback);
+          }
           // src also a javascript property; the src attribute is set in the ctor.
           cb.src = aURL;
           if (aMode == "minimized")
             cb.setAttribute("minimized", "true");
-          cb.setAttribute("origin", aProvider.origin);
+          cb.setAttribute("origin", aOrigin);
+          cb.setAttribute("label", aTitle);
           this.insertBefore(cb, this.firstChild);
           this.selectedChat = cb;
           this.chatboxForURL.set(aURL, Cu.getWeakReference(cb));
           this.resize();
+          return cb;
         ]]></body>
       </method>
 
@@ -648,12 +652,14 @@
         ]]></body>
       </method>
 
-      <!-- Moves a chatbox to a new window. -->
+      <!-- Moves a chatbox to a new window. Returns a promise that is resolved
+           once the move to the other window is complete.
+      -->
       <method name="detachChatbox">
         <parameter name="aChatbox"/>
         <parameter name="aOptions"/>
-        <parameter name="aCallback"/>
         <body><![CDATA[
+          let deferred = Promise.defer();
           let options = "";
           for (let name in aOptions)
             options += "," + name + "=" + aOptions[name];
@@ -669,9 +675,9 @@
             let otherChatbox = otherWin.document.getElementById("chatter");
             aChatbox.swapDocShells(otherChatbox);
             aChatbox.close();
-            if (aCallback)
-              aCallback(otherWin);
+            deferred.resolve(otherChatbox);
           }, true);
+          return deferred.promise;
         ]]></body>
       </method>
 
@@ -750,11 +756,12 @@
         let top = Math.min(Math.max(eY, sY.value),
                            sY.value + sHeight.value - winHeight);
 
-        let provider = Social._getProviderFromOrigin(draggedChat.content.getAttribute("origin"));
-        this.detachChatbox(draggedChat, { screenX: left, screenY: top }, win => {
-          win.document.title = provider.name;
-        });
-
+        let title = draggedChat.content.getAttribute("title");
+        this.detachChatbox(draggedChat, { screenX: left, screenY: top }).then(
+          chatbox => {
+            chatbox.contentWindow.document.title = title;
+          }
+        );
         event.stopPropagation();
       ]]></handler>
     </handlers>
diff --git a/browser/base/content/test/social/browser_social_chatwindow.js b/browser/base/content/test/social/browser_social_chatwindow.js
index e24f2144e17..b86d4d17aca 100644
--- a/browser/base/content/test/social/browser_social_chatwindow.js
+++ b/browser/base/content/test/social/browser_social_chatwindow.js
@@ -44,6 +44,11 @@ function openChat(provider, callback) {
   gURLsNotRemembered.push(url);
 }
 
+function windowHasChats(win) {
+  let chatbar = win.document.getElementById("pinnedchats");
+  return !!chatbar.firstElementChild;
+}
+
 function test() {
   requestLongerTimeout(2); // only debug builds seem to need more time...
   waitForExplicitFinish();
@@ -341,61 +346,6 @@ var tests = {
     });
   },
 
-  testActivity: function(next) {
-    let port = SocialSidebar.provider.getWorkerPort();
-    port.postMessage({topic: "test-init"});
-    get3ChatsForCollapsing("normal", function(first, second, third) {
-      let chatbar = window.SocialChatBar.chatbar;
-      is(chatbar.selectedChat, third, "third chat should be selected");
-      ok(!chatbar.selectedChat.hasAttribute("activity"), "third chat should have no activity");
-      // send an activity message to the second.
-      ok(!second.hasAttribute("activity"), "second chat should have no activity");
-      let chat2 = second.content;
-      let evt = chat2.contentDocument.createEvent("CustomEvent");
-      evt.initCustomEvent("socialChatActivity", true, true, {});
-      chat2.contentDocument.documentElement.dispatchEvent(evt);
-      // second should have activity.
-      ok(second.hasAttribute("activity"), "second chat should now have activity");
-      // select the second - it should lose "activity"
-      chatbar.selectedChat = second;
-      ok(!second.hasAttribute("activity"), "second chat should no longer have activity");
-      // Now try the first - it is collapsed, so the 'nub' also gets activity attr.
-      ok(!first.hasAttribute("activity"), "first chat should have no activity");
-      let chat1 = first.content;
-      let evt = chat1.contentDocument.createEvent("CustomEvent");
-      evt.initCustomEvent("socialChatActivity", true, true, {});
-      chat1.contentDocument.documentElement.dispatchEvent(evt);
-      ok(first.hasAttribute("activity"), "first chat should now have activity");
-      ok(chatbar.nub.hasAttribute("activity"), "nub should also have activity");
-      // first is collapsed, so use openChat to get it.
-      chatbar.openChat(SocialSidebar.provider, first.getAttribute("src"));
-      ok(!first.hasAttribute("activity"), "first chat should no longer have activity");
-      // The nub should lose the activity flag here too
-      todo(!chatbar.nub.hasAttribute("activity"), "Bug 806266 - nub should no longer have activity");
-      // TODO: tests for bug 806266 should arrange to have 2 chats collapsed
-      // then open them checking the nub is updated correctly.
-      // Now we will go and change the embedded browser in the second chat and
-      // ensure the activity magic still works (ie, check that the unload for
-      // the browser didn't cause our event handlers to be removed.)
-      ok(!second.hasAttribute("activity"), "second chat should have no activity");
-      let subiframe = chat2.contentDocument.getElementById("iframe");
-      subiframe.contentWindow.addEventListener("unload", function subunload() {
-        subiframe.contentWindow.removeEventListener("unload", subunload);
-        // ensure all other unload listeners have fired.
-        executeSoon(function() {
-          let evt = chat2.contentDocument.createEvent("CustomEvent");
-          evt.initCustomEvent("socialChatActivity", true, true, {});
-          chat2.contentDocument.documentElement.dispatchEvent(evt);
-          ok(second.hasAttribute("activity"), "second chat still has activity after unloading sub-iframe");
-          closeAllChats();
-          port.close();
-          next();
-        })
-      })
-      subiframe.setAttribute("src", "data:text/plain:new location for iframe");
-    });
-  },
-
   testOnlyOneCallback: function(next) {
     let chats = document.getElementById("pinnedchats");
     let port = SocialSidebar.provider.getWorkerPort();
@@ -448,31 +398,31 @@ var tests = {
     // Tests that when a worker creates a chat, it is opened in the correct
     // window.
     // open a chat (it will open in the main window)
-    ok(!window.SocialChatBar.hasChats, "first window should start with no chats");
+    ok(!windowHasChats(window), "first window should start with no chats");
     openChat(SocialSidebar.provider, function() {
-      ok(window.SocialChatBar.hasChats, "first window has the chat");
+      ok(windowHasChats(window), "first window has the chat");
       // create a second window - this will be the "most recent" and will
       // therefore be the window that hosts the new chat (see bug 835111)
       let secondWindow = OpenBrowserWindow();
       secondWindow.addEventListener("load", function loadListener() {
         secondWindow.removeEventListener("load", loadListener);
-        ok(!secondWindow.SocialChatBar.hasChats, "second window has no chats");
+        ok(!windowHasChats(secondWindow), "second window has no chats");
         openChat(SocialSidebar.provider, function() {
-          ok(secondWindow.SocialChatBar.hasChats, "second window now has chats");
+          ok(windowHasChats(secondWindow), "second window now has chats");
           is(window.SocialChatBar.chatbar.childElementCount, 1, "first window still has 1 chat");
           window.SocialChatBar.chatbar.removeAll();
           // now open another chat - it should still open in the second.
           openChat(SocialSidebar.provider, function() {
-            ok(!window.SocialChatBar.hasChats, "first window has no chats");
-            ok(secondWindow.SocialChatBar.hasChats, "second window has a chat");
+            ok(!windowHasChats(window), "first window has no chats");
+            ok(windowHasChats(secondWindow), "second window has a chat");
 
             // focus the first window, and open yet another chat - it
             // should open in the first window.
             waitForFocus(function() {
               openChat(SocialSidebar.provider, function() {
-                ok(window.SocialChatBar.hasChats, "first window has chats");
+                ok(windowHasChats(window), "first window has chats");
                 window.SocialChatBar.chatbar.removeAll();
-                ok(!window.SocialChatBar.hasChats, "first window has no chats");
+                ok(!windowHasChats(window), "first window has no chats");
 
                 let privateWindow = OpenBrowserWindow({private: true});
                 privateWindow.addEventListener("load", function loadListener() {
@@ -486,7 +436,7 @@ var tests = {
                     let os = Services.appinfo.OS;
                     const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
                     let fn = BROKEN_WM_Z_ORDER ? todo : ok;
-                    fn(window.SocialChatBar.hasChats, "first window has a chat");
+                    fn(windowHasChats(window), "first window has a chat");
                     window.SocialChatBar.chatbar.removeAll();
 
                     privateWindow.close();
diff --git a/browser/base/content/test/social/browser_social_errorPage.js b/browser/base/content/test/social/browser_social_errorPage.js
index 020b26042b2..8209dbd4c2f 100644
--- a/browser/base/content/test/social/browser_social_errorPage.js
+++ b/browser/base/content/test/social/browser_social_errorPage.js
@@ -174,5 +174,36 @@ var tests = {
         });
       }
     );
+  },
+
+  testChatWindowAfterTearOff: function(next) {
+    // Ensure that the error listener survives the chat window being detached.
+    let url = "https://example.com/browser/browser/base/content/test/social/social_chat.html";
+    let panelCallbackCount = 0;
+    // open a chat while we are still online.
+    openChat(
+      url,
+      null,
+      function() { // the "load" callback.
+        executeSoon(function() {
+          let chat = SocialChatBar.chatbar.selectedChat;
+          is(chat.contentDocument.location.href, url, "correct url loaded");
+          // toggle to a detached window.
+          chat.swapWindows().then(
+            chat => {
+              // now go offline and reload the chat - about:socialerror should be loaded.
+              goOffline();
+              chat.contentDocument.location.reload();
+              waitForCondition(function() chat.contentDocument.location.href.indexOf("about:socialerror?")==0,
+                               function() {
+                                chat.close();
+                                next();
+                                },
+                               "error page didn't appear");
+            }
+          );
+        });
+      }
+    );
   }
 }
diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js
index 9b006c8087a..1747a3c7223 100644
--- a/browser/base/content/test/social/head.js
+++ b/browser/base/content/test/social/head.js
@@ -237,8 +237,6 @@ function checkSocialUI(win) {
     _is(!!a, !!b, msg);
   }
   isbool(win.SocialSidebar.canShow, sidebarEnabled, "social sidebar active?");
-  isbool(win.SocialChatBar.isAvailable, enabled, "chatbar available?");
-  isbool(!win.SocialChatBar.chatbar.hidden, enabled, "chatbar visible?");
 
   let contextMenus = [
     {
@@ -279,8 +277,6 @@ function checkSocialUI(win) {
   // and for good measure, check all the social commands.
   isbool(!doc.getElementById("Social:ToggleSidebar").hidden, sidebarEnabled, "Social:ToggleSidebar visible?");
   isbool(!doc.getElementById("Social:ToggleNotifications").hidden, enabled, "Social:ToggleNotifications visible?");
-  isbool(!doc.getElementById("Social:FocusChat").hidden, enabled, "Social:FocusChat visible?");
-  isbool(doc.getElementById("Social:FocusChat").getAttribute("disabled"), enabled ? "false" : "true", "Social:FocusChat disabled?");
 
   // and report on overall success of failure of the various checks here.
   is(numGoodTests, numTests, "The Social UI tests succeeded.")
diff --git a/browser/modules/Chat.jsm b/browser/modules/Chat.jsm
new file mode 100644
index 00000000000..bb9ef90be64
--- /dev/null
+++ b/browser/modules/Chat.jsm
@@ -0,0 +1,191 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+// A module for working with chat windows.
+
+this.EXPORTED_SYMBOLS = ["Chat"];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
+  "resource://gre/modules/PrivateBrowsingUtils.jsm");
+
+// A couple of internal helper function.
+function isWindowChromeless(win) {
+  // XXX - stolen from browser-social.js, but there's no obvious place to
+  // put this so it can be shared.
+
+  // Is this a popup window that doesn't want chrome shown?
+  let docElem = win.document.documentElement;
+  // extrachrome is not restored during session restore, so we need
+  // to check for the toolbar as well.
+  let chromeless = docElem.getAttribute("chromehidden").contains("extrachrome") ||
+                   docElem.getAttribute('chromehidden').contains("toolbar");
+  return chromeless;
+}
+
+function isWindowGoodForChats(win) {
+  return !win.closed &&
+         !!win.document.getElementById("pinnedchats") &&
+         !isWindowChromeless(win) &&
+         !PrivateBrowsingUtils.isWindowPrivate(win);
+}
+
+function getChromeWindow(contentWin) {
+  return contentWin.QueryInterface(Ci.nsIInterfaceRequestor)
+                   .getInterface(Ci.nsIWebNavigation)
+                   .QueryInterface(Ci.nsIDocShellTreeItem)
+                   .rootTreeItem
+                   .QueryInterface(Ci.nsIInterfaceRequestor)
+                   .getInterface(Ci.nsIDOMWindow);
+}
+
+/*
+ * The exported Chat object
+ */
+
+let Chat = {
+  /**
+   * Open a new chatbox.
+   *
+   * @param contentWindow [optional]
+   *        The content window that requested this chat.  May be null.
+   * @param origin
+   *        The origin for the chat.  This is primarily used as an identifier
+   *        to help identify all chats from the same provider.
+   * @param title
+   *        The title to be used if a new chat window is created.
+   * @param url
+   *        The URL for the that.  Should be under the origin.  If an existing
+   *        chatbox exists with the same URL, it will be reused and returned.
+   * @param mode [optional]
+   *        May be undefined or 'minimized'
+   * @param focus [optional]
+   *        Indicates if the chatbox should be focused.  If undefined the chat
+   *        will be focused if the window is currently handling user input (ie,
+   *        if the chat is being opened as a direct result of user input)
+
+   * @return A chatbox binding.  This binding has a number of promises which
+   *         can be used to determine when the chatbox is being created and
+   *         has loaded.  Will return null if no chat can be created (Which
+   *         should only happen in edge-cases)
+   */
+  open: function(contentWindow, origin, title, url, mode, focus, callback) {
+    let chromeWindow = this.findChromeWindowForChats(contentWindow);
+    if (!chromeWindow) {
+      Cu.reportError("Failed to open a chat window - no host window could be found.");
+      return null;
+    }
+
+    let chatbar = chromeWindow.document.getElementById("pinnedchats");
+    chatbar.hidden = false;
+    let chatbox = chatbar.openChat(origin, title, url, mode, callback);
+    // getAttention is ignored if the target window is already foreground, so
+    // we can call it unconditionally.
+    chromeWindow.getAttention();
+    // If focus is undefined we want automatic focus handling, and only focus
+    // if a direct result of user action.
+    if (focus === undefined) {
+      let dwu = chromeWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                            .getInterface(Ci.nsIDOMWindowUtils);
+      focus = dwu.isHandlingUserInput;
+    }
+    if (focus) {
+      chatbar.focus();
+    }
+    return chatbox;
+  },
+
+  /**
+   * Close all chats from the specified origin.
+   *
+   * @param origin
+   *        The origin from which all chats should be closed.
+   */
+  closeAll: function(origin) {
+    // close all attached chat windows
+    let winEnum = Services.wm.getEnumerator("navigator:browser");
+    while (winEnum.hasMoreElements()) {
+      let win = winEnum.getNext();
+      let chatbar = win.document.getElementById("pinnedchats");
+      if (!chatbar)
+        continue;
+      let chats = [c for (c of chatbar.children) if (c.content.getAttribute("origin") == origin)];
+      [c.close() for (c of chats)];
+    }
+
+    // close all standalone chat windows
+    winEnum = Services.wm.getEnumerator("Social:Chat");
+    while (winEnum.hasMoreElements()) {
+      let win = winEnum.getNext();
+      if (win.closed)
+        continue;
+      let chatOrigin = win.document.getElementById("chatter").content.getAttribute("origin");
+      if (origin == chatOrigin)
+        win.close();
+    }
+  },
+
+  /**
+   * Focus the chatbar associated with a window
+   *
+   * @param window
+   */
+  focus: function(win) {
+    let chatbar = win.document.getElementById("pinnedchats");
+    if (chatbar && !chatbar.hidden) {
+      chatbar.focus();
+    }
+
+  },
+
+  // This is exported as socialchat.xml needs to find a window when a chat
+  // is re-docked.
+  findChromeWindowForChats: function(preferredWindow) {
+    if (preferredWindow) {
+      preferredWindow = getChromeWindow(preferredWindow);
+      if (isWindowGoodForChats(preferredWindow)) {
+        return preferredWindow;
+      }
+    }
+    // no good - we just use the "most recent" browser window which can host
+    // chats (we used to try and "group" all chats in the same browser window,
+    // but that didn't work out so well - see bug 835111
+
+    // Try first the most recent window as getMostRecentWindow works
+    // even on platforms where getZOrderDOMWindowEnumerator is broken
+    // (ie. Linux).  This will handle most cases, but won't work if the
+    // foreground window is a popup.
+
+    let mostRecent = Services.wm.getMostRecentWindow("navigator:browser");
+    if (isWindowGoodForChats(mostRecent))
+      return mostRecent;
+
+    let topMost, enumerator;
+    // *sigh* - getZOrderDOMWindowEnumerator is broken except on Mac and
+    // Windows.  We use BROKEN_WM_Z_ORDER as that is what some other code uses
+    // and a few bugs recommend searching mxr for this symbol to identify the
+    // workarounds - we want this code to be hit in such searches.
+    let os = Services.appinfo.OS;
+    const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
+    if (BROKEN_WM_Z_ORDER) {
+      // this is oldest to newest and no way to change the order.
+      enumerator = Services.wm.getEnumerator("navigator:browser");
+    } else {
+      // here we explicitly ask for bottom-to-top so we can use the same logic
+      // where BROKEN_WM_Z_ORDER is true.
+      enumerator = Services.wm.getZOrderDOMWindowEnumerator("navigator:browser", false);
+    }
+    while (enumerator.hasMoreElements()) {
+      let win = enumerator.getNext();
+      if (!win.closed && isWindowGoodForChats(win))
+        topMost = win;
+    }
+    return topMost;
+  },
+}
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 00c701809f1..a2572cb0145 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -9,6 +9,7 @@ TEST_DIRS += ['test']
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
+    'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
     'ContentSearch.jsm',
diff --git a/toolkit/components/social/MozSocialAPI.jsm b/toolkit/components/social/MozSocialAPI.jsm
index e03a0641ed6..3b5d6107487 100644
--- a/toolkit/components/social/MozSocialAPI.jsm
+++ b/toolkit/components/social/MozSocialAPI.jsm
@@ -8,6 +8,8 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "SocialService", "resource://gre/modules/SocialService.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Social", "resource:///modules/Social.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
 this.EXPORTED_SYMBOLS = ["MozSocialAPI", "openChatWindow", "findChromeWindowForChats", "closeAllChatWindows"];
@@ -125,7 +127,7 @@ function attachToWindow(provider, targetWindow) {
       writable: true,
       value: function(toURL, callback) {
         let url = targetWindow.document.documentURIObject.resolve(toURL);
-        openChatWindow(getChromeWindow(targetWindow), provider, url, callback);
+        openChatWindow(targetWindow, provider, url, callback);
       }
     },
     openPanel: {
@@ -270,92 +272,31 @@ function getChromeWindow(contentWin) {
                    .getInterface(Ci.nsIDOMWindow);
 }
 
-function isWindowGoodForChats(win) {
-  return win.SocialChatBar
-         && win.SocialChatBar.isAvailable
-         && !PrivateBrowsingUtils.isWindowPrivate(win);
-}
-
-function findChromeWindowForChats(preferredWindow) {
-  if (preferredWindow && isWindowGoodForChats(preferredWindow))
-    return preferredWindow;
-  // no good - we just use the "most recent" browser window which can host
-  // chats (we used to try and "group" all chats in the same browser window,
-  // but that didn't work out so well - see bug 835111
-
-  // Try first the most recent window as getMostRecentWindow works
-  // even on platforms where getZOrderDOMWindowEnumerator is broken
-  // (ie. Linux).  This will handle most cases, but won't work if the
-  // foreground window is a popup.
-
-  let mostRecent = Services.wm.getMostRecentWindow("navigator:browser");
-  if (isWindowGoodForChats(mostRecent))
-    return mostRecent;
-
-  let topMost, enumerator;
-  // *sigh* - getZOrderDOMWindowEnumerator is broken except on Mac and
-  // Windows.  We use BROKEN_WM_Z_ORDER as that is what some other code uses
-  // and a few bugs recommend searching mxr for this symbol to identify the
-  // workarounds - we want this code to be hit in such searches.
-  let os = Services.appinfo.OS;
-  const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
-  if (BROKEN_WM_Z_ORDER) {
-    // this is oldest to newest and no way to change the order.
-    enumerator = Services.wm.getEnumerator("navigator:browser");
-  } else {
-    // here we explicitly ask for bottom-to-top so we can use the same logic
-    // where BROKEN_WM_Z_ORDER is true.
-    enumerator = Services.wm.getZOrderDOMWindowEnumerator("navigator:browser", false);
-  }
-  while (enumerator.hasMoreElements()) {
-    let win = enumerator.getNext();
-    if (!win.closed && isWindowGoodForChats(win))
-      topMost = win;
-  }
-  return topMost;
-}
-
 this.openChatWindow =
- function openChatWindow(chromeWindow, provider, url, callback, mode) {
-  chromeWindow = findChromeWindowForChats(chromeWindow);
-  if (!chromeWindow) {
-    Cu.reportError("Failed to open a social chat window - no host window could be found.");
-    return;
-  }
+ function openChatWindow(contentWindow, provider, url, callback, mode) {
   let fullURI = provider.resolveUri(url);
   if (!provider.isSameOrigin(fullURI)) {
     Cu.reportError("Failed to open a social chat window - the requested URL is not the same origin as the provider.");
     return;
   }
-  if (!chromeWindow.SocialChatBar.openChat(provider, fullURI.spec, callback, mode)) {
-    Cu.reportError("Failed to open a social chat window - the chatbar is not available in the target window.");
-    return;
+
+  let thisCallback = function(chatbox) {
+    // All social chat windows get a special error listener.
+    Social.setErrorListener(chatbox.content, function(aBrowser) {
+      aBrowser.webNavigation.loadURI("about:socialerror?mode=compactInfo&origin=" +
+                             encodeURIComponent(aBrowser.getAttribute("origin")),
+                             null, null, null, null);
+    });
+  }
+  let chatbox = Chat.open(contentWindow, provider.origin, provider.name,
+                          fullURI.spec, mode, undefined, thisCallback);
+  if (callback) {
+    chatbox.promiseChatLoaded.then(() => {
+      callback(chatbox.contentWindow);
+    });
   }
-  // getAttention is ignored if the target window is already foreground, so
-  // we can call it unconditionally.
-  chromeWindow.getAttention();
 }
 
-this.closeAllChatWindows =
- function closeAllChatWindows(provider) {
-  // close all attached chat windows
-  let winEnum = Services.wm.getEnumerator("navigator:browser");
-  while (winEnum.hasMoreElements()) {
-    let win = winEnum.getNext();
-    if (!win.SocialChatBar)
-      continue;
-    let chats = [c for (c of win.SocialChatBar.chatbar.children) if (c.content.getAttribute("origin") == provider.origin)];
-    [c.close() for (c of chats)];
-  }
-
-  // close all standalone chat windows
-  winEnum = Services.wm.getEnumerator("Social:Chat");
-  while (winEnum.hasMoreElements()) {
-    let win = winEnum.getNext();
-    if (win.closed)
-      continue;
-    let origin = win.document.getElementById("chatter").content.getAttribute("origin");
-    if (provider.origin == origin)
-      win.close();
-  }
+this.closeAllChatWindows = function closeAllChatWindows(provider) {
+  return Chat.closeAll(provider.origin);
 }

From eef4227d00e2fd3531cbdd4c2504c70dd8ad82c5 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 7 May 2014 09:58:18 +1000
Subject: [PATCH 05/11] Bug 1002914 (part 2) - remove SocialChatBar, add chat
 specific tests and refactor social tests. r=mixedpuppy

---
 browser/base/content/browser-social.js        |  14 -
 browser/base/content/socialchat.xml           |  16 -
 browser/base/content/test/chat/browser.ini    |   8 +
 .../content/test/chat/browser_chatwindow.js   | 135 ++++++++
 .../base/content/test/chat/browser_focus.js   | 226 +++++++++++++
 .../base/content/test/chat/browser_tearoff.js | 128 ++++++++
 browser/base/content/test/chat/chat.html      |  14 +
 browser/base/content/test/chat/head.js        |  74 +++++
 browser/base/content/test/social/browser.ini  |   1 -
 .../test/social/browser_chat_tearoff.js       | 308 ------------------
 .../test/social/browser_social_chatwindow.js  | 221 +------------
 .../social/browser_social_chatwindowfocus.js  | 228 ++-----------
 .../test/social/browser_social_errorPage.js   |  15 +-
 browser/base/content/test/social/head.js      |  41 ++-
 browser/base/moz.build                        |   1 +
 15 files changed, 643 insertions(+), 787 deletions(-)
 create mode 100644 browser/base/content/test/chat/browser.ini
 create mode 100644 browser/base/content/test/chat/browser_chatwindow.js
 create mode 100644 browser/base/content/test/chat/browser_focus.js
 create mode 100644 browser/base/content/test/chat/browser_tearoff.js
 create mode 100644 browser/base/content/test/chat/chat.html
 create mode 100644 browser/base/content/test/chat/head.js
 delete mode 100644 browser/base/content/test/social/browser_chat_tearoff.js

diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index f7e4e186125..4d3a932a380 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -4,7 +4,6 @@
 
 // the "exported" symbols
 let SocialUI,
-    SocialChatBar,
     SocialFlyout,
     SocialMarks,
     SocialShare,
@@ -296,19 +295,6 @@ SocialUI = {
   }
 }
 
-SocialChatBar = {
-  get chatbar() {
-    return document.getElementById("pinnedchats");
-  },
-  openChat: function(aProvider, aURL, aCallback, aMode) {
-    // Until we refactor the tests we can't remove this.
-    // Reach into the social API.
-    let openChatWindow = Cu.import("resource://gre/modules/MozSocialAPI.jsm", {}).openChatWindow;
-    openChatWindow(window, aProvider, aURL, aCallback, aMode);
-    return true;
-  },
-}
-
 SocialFlyout = {
   get panel() {
     return document.getElementById("social-flyout-panel");
diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index 714d90d3701..409c86d43b4 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -515,22 +515,6 @@
         ]]></body>
       </method>
 
-      <!-- XXX - we should remove this - it is currently used only by tests.
-           No-one has any business removing all chats.  Chat.jsm exposes a
-           method to close all chats from a specific origin which is all that
-           should be necessary.
-      -->
-      <method name="removeAll">
-        <body><![CDATA[
-          this.selectedChat = null;
-          while (this.firstElementChild) {
-            this._remove(this.firstElementChild);
-          }
-          // and the nub/popup must also die.
-          this.nub.collapsed = true;
-        ]]></body>
-      </method>
-
       <method name="openChat">
         <parameter name="aOrigin"/>
         <parameter name="aTitle"/>
diff --git a/browser/base/content/test/chat/browser.ini b/browser/base/content/test/chat/browser.ini
new file mode 100644
index 00000000000..b5ef3f7d85c
--- /dev/null
+++ b/browser/base/content/test/chat/browser.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+support-files =
+  head.js
+  chat.html
+
+[browser_chatwindow.js]
+[browser_focus.js]
+[browser_tearoff.js]
diff --git a/browser/base/content/test/chat/browser_chatwindow.js b/browser/base/content/test/chat/browser_chatwindow.js
new file mode 100644
index 00000000000..57339fc1486
--- /dev/null
+++ b/browser/base/content/test/chat/browser_chatwindow.js
@@ -0,0 +1,135 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let chatbar = document.getElementById("pinnedchats");
+
+add_chat_task(function* testOpenCloseChat() {
+  let chatbox = yield promiseOpenChat("http://example.com");
+  Assert.strictEqual(chatbox, chatbar.selectedChat);
+  // we requested a "normal" chat, so shouldn't be minimized
+  Assert.ok(!chatbox.minimized, "chat is not minimized");
+  Assert.equal(chatbar.childNodes.length, 1, "should be 1 chat open");
+
+
+  // now request the same URL again - we should get the same chat.
+  let chatbox2 = yield promiseOpenChat("http://example.com");
+  Assert.strictEqual(chatbox2, chatbox, "got the same chat");
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+
+  chatbox.toggle();
+  is(chatbox.minimized, true, "chat is now minimized");
+  // was no other chat to select, so selected becomes null.
+  is(chatbar.selectedChat, null);
+
+  // We check the content gets an unload event as we close it.
+  let promiseClosed = promiseOneEvent(chatbox.content, "unload", true);
+  chatbox.close();
+  yield promiseClosed;
+});
+
+// In this case we open a chat minimized, then request the same chat again
+// without specifying minimized.  On that second call the chat should open,
+// selected, and no longer minimized.
+add_chat_task(function* testMinimized() {
+  let chatbox = yield promiseOpenChat("http://example.com", "minimized");
+  Assert.strictEqual(chatbox, chatbar.selectedChat);
+  Assert.ok(chatbox.minimized, "chat is minimized");
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+  yield promiseOpenChat("http://example.com");
+  Assert.ok(!chatbox.minimized, false, "chat is no longer minimized");
+});
+
+// open enough chats to overflow the window, then check
+// if the menupopup is visible
+add_chat_task(function* testManyChats() {
+  Assert.ok(chatbar.menupopup.parentNode.collapsed, "popup nub collapsed at start");
+  // we should *never* find a test box that needs more than this to cause
+  // an overflow!
+  let maxToOpen = 20;
+  let numOpened = 0;
+  for (let i = 0; i < maxToOpen; i++) {
+    yield promiseOpenChat("http://example.com#" + i);
+    if (!chatbar.menupopup.parentNode.collapsed) {
+      info("the menu popup appeared");
+      return;
+    }
+  }
+  Assert.ok(false, "We didn't find a collapsed chat after " + maxToOpen + "chats!");
+});
+
+// Check that closeAll works as expected.
+add_chat_task(function* testOpenTwiceCallbacks() {
+  yield promiseOpenChat("http://example.com#1");
+  yield promiseOpenChat("http://example.com#2");
+  yield promiseOpenChat("http://test2.example.com");
+  Assert.equal(numChatsInWindow(window), 3, "should be 3 chats open");
+  Chat.closeAll("http://example.com");
+  Assert.equal(numChatsInWindow(window), 1, "should have closed 2 chats");
+  Chat.closeAll("http://test2.example.com");
+  Assert.equal(numChatsInWindow(window), 0, "should have closed last chat");
+});
+
+// Check that when we open the same chat twice, the callbacks are called back
+// twice.
+add_chat_task(function* testOpenTwiceCallbacks() {
+  yield promiseOpenChatCallback("http://example.com");
+  yield promiseOpenChatCallback("http://example.com");
+});
+
+// Bug 817782 - check chats work in new top-level windows.
+add_chat_task(function* testSecondTopLevelWindow() {
+  const chatUrl = "http://example.com";
+  let secondWindow = OpenBrowserWindow();
+  yield promiseOneEvent(secondWindow, "load");
+  yield promiseOpenChat(chatUrl);
+  // the chat was created - let's make sure it was created in the second window.
+  Assert.equal(numChatsInWindow(window), 0, "main window has no chats");
+  Assert.equal(numChatsInWindow(secondWindow), 1, "second window has 1 chat");
+  secondWindow.close();
+});
+
+// Test that chats are created in the correct window.
+add_chat_task(function* testChatWindowChooser() {
+  let chat = yield promiseOpenChat("http://example.com");
+  Assert.equal(numChatsInWindow(window), 1, "first window has the chat");
+  // create a second window - this will be the "most recent" and will
+  // therefore be the window that hosts the new chat (see bug 835111)
+  let secondWindow = OpenBrowserWindow();
+  yield promiseOneEvent(secondWindow, "load");
+  Assert.equal(numChatsInWindow(secondWindow), 0, "second window starts with no chats");
+  yield promiseOpenChat("http://example.com#2");
+  Assert.equal(numChatsInWindow(secondWindow), 1, "second window now has chats");
+  Assert.equal(numChatsInWindow(window), 1, "first window still has 1 chat");
+  chat.close();
+  Assert.equal(numChatsInWindow(window), 0, "first window now has no chats");
+  // now open another chat - it should still open in the second.
+  yield promiseOpenChat("http://example.com#3");
+  Assert.equal(numChatsInWindow(window), 0, "first window still has no chats");
+  Assert.equal(numChatsInWindow(secondWindow), 2, "second window has both chats");
+
+  // focus the first window, and open yet another chat - it
+  // should open in the first window.
+  window.focus();
+  yield promiseWaitForFocus();
+  chat = yield promiseOpenChat("http://example.com#4");
+  Assert.equal(numChatsInWindow(window), 1, "first window got new chat");
+  chat.close();
+  Assert.equal(numChatsInWindow(window), 0, "first window has no chats");
+
+  let privateWindow = OpenBrowserWindow({private: true});
+  yield promiseOneEvent(privateWindow, "load")
+
+  // open a last chat - the focused window can't accept
+  // chats (it's a private window), so the chat should open
+  // in the window that was selected before. This is known
+  // to be broken on Linux.
+  chat = yield promiseOpenChat("http://example.com#5");
+  let os = Services.appinfo.OS;
+  const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
+  let fn = BROKEN_WM_Z_ORDER ? todo : ok;
+  fn(numChatsInWindow(window) == 1, "first window got the chat");
+  chat.close();
+  privateWindow.close();
+  secondWindow.close();
+});
diff --git a/browser/base/content/test/chat/browser_focus.js b/browser/base/content/test/chat/browser_focus.js
new file mode 100644
index 00000000000..0aa094553c3
--- /dev/null
+++ b/browser/base/content/test/chat/browser_focus.js
@@ -0,0 +1,226 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Tests the focus functionality.
+
+const CHAT_URL = "https://example.com/browser/browser/base/content/test/chat/chat.html";
+
+// Is the currently opened tab focused?
+function isTabFocused() {
+  let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
+  return Services.focus.focusedWindow == tabb.contentWindow;
+}
+
+// Is the specified chat focused?
+function isChatFocused(chat) {
+  return chat.chatbar._isChatFocused(chat);
+}
+
+let chatbar = document.getElementById("pinnedchats");
+
+function* setUp() {
+  // Note that (probably) due to bug 604289, if a tab is focused but the
+  // focused element is null, our chat windows can "steal" focus.  This is
+  // avoided if we explicitly focus an element in the tab.
+  // So we load a page with an <input> field and focus that before testing.
+  let html = '<input id="theinput"><button id="chat-opener"></button>';
+  let url = "data:text/html;charset=utf-8," + encodeURI(html);
+  let tab = gBrowser.selectedTab = gBrowser.addTab(url, {skipAnimation: true});
+  yield promiseOneEvent(tab.linkedBrowser, "load", true);
+  tab.linkedBrowser.contentDocument.getElementById("theinput").focus();
+  registerCleanupFunction(function() {
+    gBrowser.removeTab(tab);
+  });
+}
+
+// Test default focus - not user input.
+add_chat_task(function* testDefaultFocus() {
+  yield setUp();
+  let chat = yield promiseOpenChat("http://example.com");
+  // we used the default focus behaviour, which means that because this was
+  // not the direct result of user action the chat should not be focused.
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+  Assert.ok(isTabFocused(), "the tab should remain focused.");
+  Assert.ok(!isChatFocused(chat), "the chat should not be focused.");
+});
+
+// Test default focus via user input.
+add_chat_task(function* testDefaultFocus() {
+  yield setUp();
+  let tab = gBrowser.selectedTab;
+  let deferred = Promise.defer();
+  let button = tab.linkedBrowser.contentDocument.getElementById("chat-opener");
+  button.addEventListener("click", function onclick() {
+    button.removeEventListener("click", onclick);
+    promiseOpenChat("http://example.com").then(
+      chat => deferred.resolve(chat)
+    );
+  })
+  // Note we must use synthesizeMouseAtCenter() rather than calling
+  // .click() directly as this causes nsIDOMWindowUtils.isHandlingUserInput
+  // to be true.
+  EventUtils.synthesizeMouseAtCenter(button, {}, button.ownerDocument.defaultView);
+  let chat = yield deferred.promise;
+
+  // we use the default focus behaviour but the chat was opened via user input,
+  // so the chat should be focused.
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+  Assert.ok(!isTabFocused(), "the tab should have lost focus.");
+  Assert.ok(isChatFocused(chat), "the chat should have got focus.");
+});
+
+// We explicitly ask for the chat to be focused.
+add_chat_task(function* testExplicitFocus() {
+  yield setUp();
+  let chat = yield promiseOpenChat("http://example.com", undefined, true);
+  // we use the default focus behaviour, which means that because this was
+  // not the direct result of user action the chat should not be focused.
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+  Assert.ok(!isTabFocused(), "the tab should have lost focus.");
+  Assert.ok(isChatFocused(chat), "the chat should have got focus.");
+});
+
+// Open a minimized chat via default focus behaviour - it will open and not
+// have focus.  Then open the same chat without 'minimized' - it will be
+// restored but should still not have grabbed focus.
+add_chat_task(function* testNoFocusOnAutoRestore() {
+  yield setUp();
+  let chat = yield promiseOpenChat("http://example.com", "minimized");
+  Assert.ok(chat.minimized, "chat is minimized");
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+  Assert.ok(isTabFocused(), "the tab should remain focused.");
+  Assert.ok(!isChatFocused(chat), "the chat should not be focused.");
+  yield promiseOpenChat("http://example.com");
+  Assert.ok(!chat.minimized, "chat should be restored");
+  Assert.ok(isTabFocused(), "the tab should remain focused.");
+  Assert.ok(!isChatFocused(chat), "the chat should not be focused.");
+});
+
+// Here we open a chat, which will not be focused.  Then we minimize it and
+// restore it via a titlebar clock - it should get focus at that point.
+add_chat_task(function* testFocusOnExplicitRestore() {
+  yield setUp();
+  let chat = yield promiseOpenChat("http://example.com");
+  Assert.ok(!chat.minimized, "chat should have been opened restored");
+  Assert.ok(isTabFocused(), "the tab should remain focused.");
+  Assert.ok(!isChatFocused(chat), "the chat should not be focused.");
+  chat.minimized = true;
+  Assert.ok(isTabFocused(), "tab should still be focused");
+  Assert.ok(!isChatFocused(chat), "the chat should not be focused.");
+
+  let promise = promiseOneEvent(chat.contentWindow, "focus");
+  // pretend we clicked on the titlebar
+  chat.onTitlebarClick({button: 0});
+  yield promise; // wait for focus event.
+  Assert.ok(!chat.minimized, "chat should have been restored");
+  Assert.ok(isChatFocused(chat), "chat should be focused");
+  Assert.strictEqual(chat, chatbar.selectedChat, "chat is marked selected");
+});
+
+// Open 2 chats and give 1 focus.  Minimize the focused one - the second
+// should get focus.
+add_chat_task(function* testMinimizeFocused() {
+  yield setUp();
+  let chat1 = yield promiseOpenChat("http://example.com#1");
+  let chat2 = yield promiseOpenChat("http://example.com#2");
+  Assert.equal(numChatsInWindow(window), 2, "2 chats open");
+  Assert.strictEqual(chatbar.selectedChat, chat2, "chat2 is selected");
+  let promise = promiseOneEvent(chat1.contentWindow, "focus");
+  chatbar.selectedChat = chat1;
+  chatbar.focus();
+  yield promise; // wait for chat1 to get focus.
+  Assert.strictEqual(chat1, chatbar.selectedChat, "chat1 is marked selected");
+  Assert.notStrictEqual(chat2, chatbar.selectedChat, "chat2 is not marked selected");
+  promise = promiseOneEvent(chat2.contentWindow, "focus");
+  chat1.minimized = true;
+  yield promise; // wait for chat2 to get focus.
+  Assert.notStrictEqual(chat1, chatbar.selectedChat, "chat1 is not marked selected");
+  Assert.strictEqual(chat2, chatbar.selectedChat, "chat2 is marked selected");
+});
+
+// Open 2 chats, select and focus the second.  Pressing the TAB key should
+// cause focus to move between all elements in our chat window before moving
+// to the next chat window.
+add_chat_task(function* testTab() {
+  yield setUp();
+
+  function sendTabAndWaitForFocus(chat, eltid) {
+    let doc = chat.contentDocument;
+    EventUtils.sendKey("tab");
+    // ideally we would use the 'focus' event here, but that doesn't work
+    // as expected for the iframe - the iframe itself never gets the focus
+    // event (apparently the sub-document etc does.)
+    // So just poll for the correct element getting focus...
+    let deferred = Promise.defer();
+    let tries = 0;
+    let interval = setInterval(function() {
+      if (tries >= 30) {
+        clearInterval(interval);
+        deferred.reject("never got focus");
+        return;
+      }
+      tries ++;
+      let elt = eltid ? doc.getElementById(eltid) : doc.documentElement;
+      if (doc.activeElement == elt) {
+        clearInterval(interval);
+        deferred.resolve();
+      }
+    });
+    return deferred.promise;
+  }
+
+  let chat1 = yield promiseOpenChat(CHAT_URL + "#1");
+  let chat2 = yield promiseOpenChat(CHAT_URL + "#2");
+  chatbar.selectedChat = chat2;
+  let promise = promiseOneEvent(chat2.contentWindow, "focus");
+  chatbar.focus();
+  yield promise;
+
+  // Our chats have 3 focusable elements, so it takes 4 TABs to move
+  // to the new chat.
+  yield sendTabAndWaitForFocus(chat2, "input1");
+  Assert.equal(chat2.contentDocument.activeElement.getAttribute("id"), "input1",
+               "first input field has focus");
+  Assert.ok(isChatFocused(chat2), "new chat still focused after first tab");
+
+  yield sendTabAndWaitForFocus(chat2, "input2");
+  Assert.ok(isChatFocused(chat2), "new chat still focused after tab");
+  Assert.equal(chat2.contentDocument.activeElement.getAttribute("id"), "input2",
+               "second input field has focus");
+
+  yield sendTabAndWaitForFocus(chat2, "iframe");
+  Assert.ok(isChatFocused(chat2), "new chat still focused after tab");
+  Assert.equal(chat2.contentDocument.activeElement.getAttribute("id"), "iframe",
+               "iframe has focus");
+
+  // this tab now should move to the next chat, but focus the
+  // document element itself (hence the null eltid)
+  yield sendTabAndWaitForFocus(chat1, null);
+  Assert.ok(isChatFocused(chat1), "first chat is focused");
+});
+
+// Open a chat and focus an element other than the first. Move focus to some
+// other item (the tab itself in this case), then focus the chatbar - the
+// same element that was previously focused should still have focus.
+add_chat_task(function* testFocusedElement() {
+  yield setUp();
+
+  // open a chat with focus requested.
+  let chat = yield promiseOpenChat(CHAT_URL, undefined, true);
+
+  chat.contentDocument.getElementById("input2").focus();
+
+  // set focus to the tab.
+  let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
+  let promise = promiseOneEvent(tabb.contentWindow, "focus");
+  Services.focus.moveFocus(tabb.contentWindow, null, Services.focus.MOVEFOCUS_ROOT, 0);
+  yield promise;
+
+  promise = promiseOneEvent(chat.contentWindow, "focus");
+  chatbar.focus();
+  yield promise;
+
+  Assert.equal(chat.contentDocument.activeElement.getAttribute("id"), "input2",
+               "correct input field still has focus");
+});
diff --git a/browser/base/content/test/chat/browser_tearoff.js b/browser/base/content/test/chat/browser_tearoff.js
new file mode 100644
index 00000000000..c9ba855767c
--- /dev/null
+++ b/browser/base/content/test/chat/browser_tearoff.js
@@ -0,0 +1,128 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let chatbar = document.getElementById("pinnedchats");
+
+function promiseNewWindowLoaded() {
+  let deferred = Promise.defer();
+  Services.wm.addListener({
+    onWindowTitleChange: function() {},
+    onCloseWindow: function(xulwindow) {},
+    onOpenWindow: function(xulwindow) {
+      var domwindow = xulwindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                            .getInterface(Components.interfaces.nsIDOMWindow);
+      Services.wm.removeListener(this);
+      // wait for load to ensure the window is ready for us to test
+      domwindow.addEventListener("load", function _load(event) {
+        let doc = domwindow.document;
+        if (event.target != doc)
+            return;
+        domwindow.removeEventListener("load", _load);
+        deferred.resolve(domwindow);
+      });
+    },
+  });
+  return deferred.promise;
+}
+
+add_chat_task(function* testTearoffChat() {
+  let chatbox = yield promiseOpenChat("http://example.com");
+  Assert.equal(numChatsInWindow(window), 1, "should be 1 chat open");
+
+  let chatDoc = chatbox.contentDocument;
+  let chatTitle = chatDoc.title;
+
+  Assert.equal(chatbox.getAttribute("label"), chatTitle,
+               "the new chatbox should show the title of the chat window");
+
+  // mutate the chat document a bit before we tear it off.
+  let div = chatDoc.createElement("div");
+  div.setAttribute("id", "testdiv");
+  div.setAttribute("test", "1");
+  chatDoc.body.appendChild(div);
+
+  // chatbox is open, lets detach. The new chat window will be caught in
+  // the window watcher below
+  let promise = promiseNewWindowLoaded();
+
+  let swap = document.getAnonymousElementByAttribute(chatbox, "anonid", "swap");
+  swap.click();
+
+  // and wait for the new window.
+  let domwindow = yield promise;
+
+  Assert.equal(domwindow.document.documentElement.getAttribute("windowtype"), "Social:Chat", "Social:Chat window opened");
+  Assert.equal(numChatsInWindow(window), 0, "should be no chats in the chat bar");
+
+  // get the chatbox from the new window.
+  chatbox = domwindow.document.getElementById("chatter")
+  Assert.equal(chatbox.getAttribute("label"), chatTitle, "window should have same title as chat");
+
+  div = chatbox.contentDocument.getElementById("testdiv");
+  Assert.equal(div.getAttribute("test"), "1", "docshell should have been swapped");
+  div.setAttribute("test", "2");
+
+  // swap the window back to the chatbar
+  promise = promiseOneEvent(domwindow, "unload");
+  swap = domwindow.document.getAnonymousElementByAttribute(chatbox, "anonid", "swap");
+  swap.click();
+
+  yield promise;
+
+  Assert.equal(numChatsInWindow(window), 1, "chat should be docked back in the window");
+  chatbox = chatbar.selectedChat;
+  Assert.equal(chatbox.getAttribute("label"), chatTitle,
+               "the new chatbox should show the title of the chat window again");
+
+  div = chatbox.contentDocument.getElementById("testdiv");
+  Assert.equal(div.getAttribute("test"), "2", "docshell should have been swapped");
+});
+
+// Similar test but with 2 chats.
+add_chat_task(function* testReattachTwice() {
+  let chatbox1 = yield promiseOpenChat("http://example.com#1");
+  let chatbox2 = yield promiseOpenChat("http://example.com#2");
+  Assert.equal(numChatsInWindow(window), 2, "both chats should be docked in the window");
+
+  info("chatboxes are open, detach from window");
+  let promise = promiseNewWindowLoaded();
+  document.getAnonymousElementByAttribute(chatbox1, "anonid", "swap").click();
+  let domwindow1 = yield promise;
+  chatbox1 = domwindow1.document.getElementById("chatter");
+  Assert.equal(numChatsInWindow(window), 1, "only second chat should be docked in the window");
+
+  promise = promiseNewWindowLoaded();
+  document.getAnonymousElementByAttribute(chatbox2, "anonid", "swap").click();
+  let domwindow2 = yield promise;
+  chatbox2 = domwindow2.document.getElementById("chatter");
+  Assert.equal(numChatsInWindow(window), 0, "should be no docked chats");
+
+  promise = promiseOneEvent(domwindow2, "unload");
+  domwindow2.document.getAnonymousElementByAttribute(chatbox2, "anonid", "swap").click();
+  yield promise;
+  Assert.equal(numChatsInWindow(window), 1, "one chat should be docked back in the window");
+
+  promise = promiseOneEvent(domwindow1, "unload");
+  domwindow1.document.getAnonymousElementByAttribute(chatbox1, "anonid", "swap").click();
+  yield promise;
+  Assert.equal(numChatsInWindow(window), 2, "both chats should be docked back in the window");
+});
+
+// Check that Chat.closeAll() also closes detached windows.
+add_chat_task(function* testCloseAll() {
+  let chatbox1 = yield promiseOpenChat("http://example.com#1");
+  let chatbox2 = yield promiseOpenChat("http://example.com#2");
+
+  let promise = promiseNewWindowLoaded();
+  document.getAnonymousElementByAttribute(chatbox1, "anonid", "swap").click();
+  let domwindow = yield promise;
+  chatbox1 = domwindow.document.getElementById("chatter");
+
+  let promiseWindowUnload = promiseOneEvent(domwindow, "unload");
+
+  Assert.equal(numChatsInWindow(window), 1, "second chat should still be docked");
+  Chat.closeAll("http://example.com");
+  yield promiseWindowUnload;
+  Assert.equal(numChatsInWindow(window), 0, "should be no chats left");
+});
diff --git a/browser/base/content/test/chat/chat.html b/browser/base/content/test/chat/chat.html
new file mode 100644
index 00000000000..c4c06f039d3
--- /dev/null
+++ b/browser/base/content/test/chat/chat.html
@@ -0,0 +1,14 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>test chat window</title>
+  </head>
+  <body>
+    <p>This is a test chat window.</p>
+    <!-- a couple of input fields to help with focus testing -->
+    <input id="input1"/>
+    <input id="input2"/>
+    <!-- an iframe here so this one page generates multiple load events -->
+    <iframe id="iframe" src="data:text/plain:this is an iframe"></iframe>
+  </body>
+</html>
diff --git a/browser/base/content/test/chat/head.js b/browser/base/content/test/chat/head.js
new file mode 100644
index 00000000000..44bc729b368
--- /dev/null
+++ b/browser/base/content/test/chat/head.js
@@ -0,0 +1,74 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Utility functions for Chat tests.
+
+let Chat = Cu.import("resource:///modules/Chat.jsm", {}).Chat;
+
+function promiseOpenChat(url, mode, focus) {
+  let uri = Services.io.newURI(url, null, null);
+  let origin = uri.prePath;
+  let title = origin;
+  let chatbox = Chat.open(null, origin, title, url, mode, focus);
+  return chatbox.promiseChatLoaded;
+}
+
+// Opens a chat, returns a promise resolved when the chat callback fired.
+function promiseOpenChatCallback(url, mode) {
+  let uri = Services.io.newURI(url, null, null);
+  let origin = uri.prePath;
+  let title = origin;
+  let deferred = Promise.defer();
+  let callback = deferred.resolve;
+  Chat.open(null, origin, title, url, mode, undefined, callback);
+  return deferred.promise;
+}
+
+// Opens a chat, returns the chat window's promise which fires when the chat
+// starts loading.
+function promiseOneEvent(target, eventName, capture) {
+  let deferred = Promise.defer();
+  target.addEventListener(eventName, function handler(event) {
+    target.removeEventListener(eventName, handler, capture);
+    deferred.resolve();
+  }, capture);
+  return deferred.promise;
+}
+
+// Return the number of chats in a browser window.
+function numChatsInWindow(win) {
+  let chatbar = win.document.getElementById("pinnedchats");
+  return chatbar.childElementCount;
+}
+
+function promiseWaitForFocus() {
+  let deferred = Promise.defer();
+  waitForFocus(deferred.resolve);
+  return deferred.promise;
+}
+
+// A simple way to clean up after each test.
+function add_chat_task(genFunction) {
+  add_task(function* () {
+    info("Starting chat test " + genFunction.name);
+    try {
+      yield genFunction();
+    } finally {
+      info("Finished chat test " + genFunction.name + " - cleaning up.");
+      // close all docked chats.
+      while (chatbar.childNodes.length) {
+        chatbar.childNodes[0].close();
+      }
+      // and non-docked chats.
+      let winEnum = Services.wm.getEnumerator("Social:Chat");
+      while (winEnum.hasMoreElements()) {
+        let win = winEnum.getNext();
+        if (win.closed) {
+          continue;
+        }
+        win.close();
+      }
+    }
+  });
+}
diff --git a/browser/base/content/test/social/browser.ini b/browser/base/content/test/social/browser.ini
index 84996f7fbb5..092dbb20262 100644
--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -26,7 +26,6 @@ support-files =
 
 [browser_addons.js]
 [browser_blocklist.js]
-[browser_chat_tearoff.js]
 [browser_defaults.js]
 [browser_share.js]
 [browser_social_activation.js]
diff --git a/browser/base/content/test/social/browser_chat_tearoff.js b/browser/base/content/test/social/browser_chat_tearoff.js
deleted file mode 100644
index 4630568a2b9..00000000000
--- a/browser/base/content/test/social/browser_chat_tearoff.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-function test() {
-  requestLongerTimeout(2); // only debug builds seem to need more time...
-  waitForExplicitFinish();
-
-  let manifest = { // normal provider
-    name: "provider 1",
-    origin: "https://example.com",
-    sidebarURL: "https://example.com/browser/browser/base/content/test/social/social_sidebar.html",
-    workerURL: "https://example.com/browser/browser/base/content/test/social/social_worker.js",
-    iconURL: "https://example.com/browser/browser/base/content/test/general/moz.png"
-  };
-
-  let postSubTest = function(cb) {
-    let chats = document.getElementById("pinnedchats");
-    ok(chats.children.length == 0, "no chatty children left behind");
-    cb();
-  };
-  runSocialTestWithProvider(manifest, function (finishcb) {
-    SocialSidebar.show();
-    ok(SocialSidebar.provider, "sidebar provider exists");
-    runSocialTests(tests, undefined, postSubTest, function() {
-      finishcb();
-    });
-  });
-}
-
-var tests = {
-  testTearoffChat: function(next) {
-    let chats = document.getElementById("pinnedchats");
-    let chatTitle;
-    let port = SocialSidebar.provider.getWorkerPort();
-    ok(port, "provider has a port");
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "got-sidebar-message":
-          port.postMessage({topic: "test-chatbox-open"});
-          break;
-        case "got-chatbox-visibility":
-          // chatbox is open, lets detach. The new chat window will be caught in
-          // the window watcher below
-          let doc = chats.selectedChat.contentDocument;
-          // This message is (sometimes!) received a second time
-          // before we start our tests from the onCloseWindow
-          // callback.
-          if (doc.location == "about:blank")
-            return;
-          chatTitle = doc.title;
-          ok(chats.selectedChat.getAttribute("label") == chatTitle,
-             "the new chatbox should show the title of the chat window");
-          let div = doc.createElement("div");
-          div.setAttribute("id", "testdiv");
-          div.setAttribute("test", "1");
-          doc.body.appendChild(div);
-          let swap = document.getAnonymousElementByAttribute(chats.selectedChat, "anonid", "swap");
-          swap.click();
-          port.close();
-          break;
-        case "got-chatbox-message":
-          ok(true, "got chatbox message");
-          ok(e.data.result == "ok", "got chatbox windowRef result: "+e.data.result);
-          chats.selectedChat.toggle();
-          break;
-      }
-    }
-
-    Services.wm.addListener({
-      onWindowTitleChange: function() {},
-      onCloseWindow: function(xulwindow) {},
-      onOpenWindow: function(xulwindow) {
-        var domwindow = xulwindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                              .getInterface(Components.interfaces.nsIDOMWindow);
-        Services.wm.removeListener(this);
-        // wait for load to ensure the window is ready for us to test
-        domwindow.addEventListener("load", function _load(event) {
-          let doc = domwindow.document;
-          if (event.target != doc)
-              return;
-
-          domwindow.removeEventListener("load", _load, false);
-
-          domwindow.addEventListener("unload", function _close(event) {
-            if (event.target != doc)
-              return;
-            domwindow.removeEventListener("unload", _close, false);
-            info("window has been closed");
-            waitForCondition(function() {
-              return chats.selectedChat && chats.selectedChat.contentDocument &&
-                     chats.selectedChat.contentDocument.readyState == "complete";
-            },function () {
-              ok(chats.selectedChat, "should have a chatbox in our window again");
-              ok(chats.selectedChat.getAttribute("label") == chatTitle,
-                 "the new chatbox should show the title of the chat window again");
-              let testdiv = chats.selectedChat.contentDocument.getElementById("testdiv");
-              is(testdiv.getAttribute("test"), "2", "docshell should have been swapped");
-              chats.selectedChat.close();
-              waitForCondition(function() {
-                return chats.children.length == 0;
-              },function () {
-                next();
-              });
-            });
-          }, false);
-
-          is(doc.documentElement.getAttribute("windowtype"), "Social:Chat", "Social:Chat window opened");
-          // window is loaded, but the docswap does not happen until after load,
-          // and we have no event to wait on, so we'll wait for document state
-          // to be ready
-          let chatbox = doc.getElementById("chatter");
-          waitForCondition(function() {
-            return chats.selectedChat == null &&
-                   chatbox.contentDocument &&
-                   chatbox.contentDocument.readyState == "complete";
-          },function() {
-            ok(chatbox.getAttribute("label") == chatTitle,
-               "detached window should show the title of the chat window");
-            let testdiv = chatbox.contentDocument.getElementById("testdiv");
-            is(testdiv.getAttribute("test"), "1", "docshell should have been swapped");
-            testdiv.setAttribute("test", "2");
-            // swap the window back to the chatbar
-            let swap = doc.getAnonymousElementByAttribute(chatbox, "anonid", "swap");
-            swap.click();
-          }, domwindow);
-        }, false);
-      }
-    });
-
-    port.postMessage({topic: "test-init", data: { id: 1 }});
-  },
-
-  testCloseOnLogout: function(next) {
-    let chats = document.getElementById("pinnedchats");
-    const chatUrl = "https://example.com/browser/browser/base/content/test/social/social_chat.html";
-    let port = SocialSidebar.provider.getWorkerPort();
-    ok(port, "provider has a port");
-    port.postMessage({topic: "test-init"});
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "got-chatbox-visibility":
-          // chatbox is open, lets detach. The new chat window will be caught in
-          // the window watcher below
-          let doc = chats.selectedChat.contentDocument;
-          // This message is (sometimes!) received a second time
-          // before we start our tests from the onCloseWindow
-          // callback.
-          if (doc.location == "about:blank")
-            return;
-          info("chatbox is open, detach from window");
-          let swap = document.getAnonymousElementByAttribute(chats.selectedChat, "anonid", "swap");
-          swap.click();
-          break;
-      }
-    }
-
-    Services.wm.addListener({
-      onWindowTitleChange: function() {},
-      onCloseWindow: function(xulwindow) {},
-      onOpenWindow: function(xulwindow) {
-        let domwindow = xulwindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                              .getInterface(Components.interfaces.nsIDOMWindow);
-        Services.wm.removeListener(this);
-        // wait for load to ensure the window is ready for us to test, make sure
-        // we're not getting called for about:blank
-        domwindow.addEventListener("load", function _load(event) {
-          let doc = domwindow.document;
-          if (event.target != doc)
-              return;
-          domwindow.removeEventListener("load", _load, false);
-
-          domwindow.addEventListener("unload", function _close(event) {
-            if (event.target != doc)
-              return;
-            domwindow.removeEventListener("unload", _close, false);
-            ok(true, "window has been closed");
-            next();
-          }, false);
-
-          is(doc.documentElement.getAttribute("windowtype"), "Social:Chat", "Social:Chat window opened");
-          // window is loaded, but the docswap does not happen until after load,
-          // and we have no event to wait on, so we'll wait for document state
-          // to be ready
-          let chatbox = doc.getElementById("chatter");
-          waitForCondition(function() {
-            return chats.children.length == 0 &&
-                   chatbox.contentDocument &&
-                   chatbox.contentDocument.readyState == "complete";
-          },function() {
-            // logout, we should get unload next
-            port.postMessage({topic: "test-logout"});
-            port.close();
-          }, domwindow);
-
-        }, false);
-      }
-    });
-
-    port.postMessage({topic: "test-worker-chat", data: chatUrl});
-  },
-
-  testReattachTwice: function(next) {
-    let chats = document.getElementById("pinnedchats");
-    const chatUrl = "https://example.com/browser/browser/base/content/test/social/social_chat.html";
-    let chatBoxCount = 0, reattachCount = 0;
-    let port = SocialSidebar.provider.getWorkerPort();
-    ok(port, "provider has a port");
-    port.postMessage({topic: "test-init"});
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "got-chatbox-visibility":
-          // chatbox is open, lets detach. The new chat window will be caught in
-          // the window watcher below
-          let doc = chats.selectedChat.contentDocument;
-          // This message is (sometimes!) received a second time
-          // before we start our tests from the onCloseWindow
-          // callback.
-          if (doc.location == "about:blank")
-            return;
-          if (++chatBoxCount != 2) {
-            // open the second chat window
-            port.postMessage({topic: "test-worker-chat", data: chatUrl + "?id=2"});
-            return;
-          }
-          info("chatbox is open, detach from window");
-          let chat1 = chats.firstChild;
-          let chat2 = chat1.nextSibling;
-          document.getAnonymousElementByAttribute(chat1, "anonid", "swap").click();
-          document.getAnonymousElementByAttribute(chat2, "anonid", "swap").click();
-          break;
-      }
-    };
-
-    let firstChatWindowDoc;
-    Services.wm.addListener({
-      onWindowTitleChange: function() {},
-      onCloseWindow: function(xulwindow) {},
-      onOpenWindow: function(xulwindow) {
-        let listener = this;
-        let domwindow = xulwindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                                 .getInterface(Components.interfaces.nsIDOMWindow);
-        // wait for load to ensure the window is ready for us to test, make sure
-        // we're not getting called for about:blank
-        domwindow.addEventListener("load", function _load(event) {
-          let doc = domwindow.document;
-          if (event.target != doc)
-            return;
-          domwindow.removeEventListener("load", _load, false);
-
-          domwindow.addEventListener("unload", function _close(event) {
-            if (event.target != doc)
-              return;
-            domwindow.removeEventListener("unload", _close, false);
-            ok(true, "window has been closed");
-            waitForCondition(function() {
-              return chats.selectedChat && chats.selectedChat.contentDocument &&
-                     chats.selectedChat.contentDocument.readyState == "complete";
-            }, function () {
-              ++reattachCount;
-              if (reattachCount == 1) {
-                info("reattaching second chat window");
-                let chatbox = firstChatWindowDoc.getElementById("chatter");
-                firstChatWindowDoc.getAnonymousElementByAttribute(chatbox, "anonid", "swap").click();
-                firstChatWindowDoc = null;
-              }
-              else if (reattachCount == 2) {
-                is(chats.children.length, 2, "both chat windows should be reattached");
-                chats.removeAll();
-                waitForCondition(() => chats.children.length == 0, function () {
-                  info("no chat window left");
-                  is(chats.chatboxForURL.size, 0, "chatboxForURL map should be empty");
-                  next();
-                });
-              }
-            }, "waited too long for the window to reattach");
-          }, false);
-
-          is(doc.documentElement.getAttribute("windowtype"), "Social:Chat", "Social:Chat window opened");
-          if (!firstChatWindowDoc) {
-            firstChatWindowDoc = doc;
-            return;
-          }
-          Services.wm.removeListener(listener);
-
-          // window is loaded, but the docswap does not happen until after load,
-          // and we have no event to wait on, so we'll wait for document state
-          // to be ready
-          let chatbox = doc.getElementById("chatter");
-          waitForCondition(function() {
-            return chats.children.length == 0 &&
-                   chatbox.contentDocument &&
-                   chatbox.contentDocument.readyState == "complete";
-          },function() {
-            info("reattaching chat window");
-            doc.getAnonymousElementByAttribute(chatbox, "anonid", "swap").click();
-          }, "waited too long for the chat window to be detached");
-
-        }, false);
-      }
-    });
-
-    port.postMessage({topic: "test-worker-chat", data: chatUrl + "?id=1"});
-  }
-};
diff --git a/browser/base/content/test/social/browser_social_chatwindow.js b/browser/base/content/test/social/browser_social_chatwindow.js
index b86d4d17aca..eda46873ca0 100644
--- a/browser/base/content/test/social/browser_social_chatwindow.js
+++ b/browser/base/content/test/social/browser_social_chatwindow.js
@@ -45,8 +45,7 @@ function openChat(provider, callback) {
 }
 
 function windowHasChats(win) {
-  let chatbar = win.document.getElementById("pinnedchats");
-  return !!chatbar.firstElementChild;
+  return !!getChatBar().firstElementChild;
 }
 
 function test() {
@@ -112,85 +111,6 @@ var tests = {
     }
     port.postMessage({topic: "test-init", data: { id: 1 }});
   },
-  testOpenMinimized: function(next) {
-    // In this case the sidebar opens a chat (without specifying minimized).
-    // We then minimize it and have the sidebar reopen the chat (again without
-    // minimized).  On that second call the chat should open and no longer
-    // be minimized.
-    let chats = document.getElementById("pinnedchats");
-    let port = SocialSidebar.provider.getWorkerPort();
-    let seen_opened = false;
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "test-init-done":
-          port.postMessage({topic: "test-chatbox-open"});
-          break;
-        case "chatbox-opened":
-          is(e.data.result, "ok", "the sidebar says it got a chatbox");
-          if (!seen_opened) {
-            // first time we got the opened message, so minimize the chat then
-            // re-request the same chat to be opened - we should get the
-            // message again and the chat should be restored.
-            ok(!chats.selectedChat.minimized, "chat not initially minimized")
-            chats.selectedChat.minimized = true
-            seen_opened = true;
-            port.postMessage({topic: "test-chatbox-open"});
-          } else {
-            // This is the second time we've seen this message - there should
-            // be exactly 1 chat open and it should no longer be minimized.
-            let chats = document.getElementById("pinnedchats");
-            ok(!chats.selectedChat.minimized, "chat no longer minimized")
-            chats.selectedChat.close();
-            is(chats.selectedChat, null, "should only have been one chat open");
-            port.close();
-            next();
-          }
-      }
-    }
-    port.postMessage({topic: "test-init", data: { id: 1 }});
-  },
-  testManyChats: function(next) {
-    // open enough chats to overflow the window, then check
-    // if the menupopup is visible
-    let port = SocialSidebar.provider.getWorkerPort();
-    let chats = document.getElementById("pinnedchats");
-    ok(port, "provider has a port");
-    ok(chats.menupopup.parentNode.collapsed, "popup nub collapsed at start");
-    port.postMessage({topic: "test-init"});
-    // we should *never* find a test box that needs more than this to cause
-    // an overflow!
-    let maxToOpen = 20;
-    let numOpened = 0;
-    let maybeOpenAnother = function() {
-      if (numOpened++ >= maxToOpen) {
-        ok(false, "We didn't find a collapsed chat after " + maxToOpen + "chats!");
-        closeAllChats();
-        next();
-      }
-      port.postMessage({topic: "test-chatbox-open", data: { id: numOpened }});
-    }
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "got-chatbox-message":
-          if (!chats.menupopup.parentNode.collapsed) {
-            maybeOpenAnother();
-            break;
-          }
-          ok(true, "popup nub became visible");
-          // close our chats now
-          while (chats.selectedChat) {
-            chats.selectedChat.close();
-          }
-          ok(!chats.selectedChat, "chats are all closed");
-          port.close();
-          next();
-          break;
-      }
-    }
-    maybeOpenAnother();
-  },
   testWorkerChatWindow: function(next) {
     const chatUrl = SocialSidebar.provider.origin + "/browser/browser/base/content/test/social/social_chat.html";
     let chats = document.getElementById("pinnedchats");
@@ -244,61 +164,10 @@ var tests = {
     }
     port.postMessage({topic: "test-init", data: { id: 1 }});
   },
-  testSameChatCallbacks: function(next) {
-    let chats = document.getElementById("pinnedchats");
-    let port = SocialSidebar.provider.getWorkerPort();
-    let seen_opened = false;
-    port.onmessage = function (e) {
-      let topic = e.data.topic;
-      switch (topic) {
-        case "test-init-done":
-          port.postMessage({topic: "test-chatbox-open"});
-          break;
-        case "chatbox-opened":
-          is(e.data.result, "ok", "the sidebar says it got a chatbox");
-          if (seen_opened) {
-            // This is the second time we've seen this message - there should
-            // be exactly 1 chat open.
-            let chats = document.getElementById("pinnedchats");
-            chats.selectedChat.close();
-            is(chats.selectedChat, null, "should only have been one chat open");
-            port.close();
-            next();
-          } else {
-            // first time we got the opened message, so re-request the same
-            // chat to be opened - we should get the message again.
-            seen_opened = true;
-            port.postMessage({topic: "test-chatbox-open"});
-          }
-      }
-    }
-    port.postMessage({topic: "test-init", data: { id: 1 }});
-  },
-
-  // check removeAll does the right thing
-  testRemoveAll: function(next, mode) {
-    let port = SocialSidebar.provider.getWorkerPort();
-    port.postMessage({topic: "test-init"});
-    get3ChatsForCollapsing(mode || "normal", function() {
-      let chatbar = window.SocialChatBar.chatbar;
-      chatbar.removeAll();
-      // should be no evidence of any chats left.
-      is(chatbar.childNodes.length, 0, "should be no chats left");
-      checkPopup();
-      is(chatbar.selectedChat, null, "nothing should be selected");
-      is(chatbar.chatboxForURL.size, 0, "chatboxForURL map should be empty");
-      port.close();
-      next();
-    });
-  },
-
-  testRemoveAllMinimized: function(next) {
-    this.testRemoveAll(next, "minimized");
-  },
 
   // Check what happens when you close the only visible chat.
   testCloseOnlyVisible: function(next) {
-    let chatbar = window.SocialChatBar.chatbar;
+    let chatbar = getChatBar();
     let chatWidth = undefined;
     let num = 0;
     is(chatbar.childNodes.length, 0, "chatbar starting empty");
@@ -336,7 +205,7 @@ var tests = {
     let port = SocialSidebar.provider.getWorkerPort();
     port.postMessage({topic: "test-init"});
     get3ChatsForCollapsing("normal", function(first, second, third) {
-      let chatbar = window.SocialChatBar.chatbar;
+      let chatbar = getChatBar();
       chatbar.showChat(first);
       ok(!first.collapsed, "first should no longer be collapsed");
       ok(second.collapsed ||  third.collapsed, false, "one of the others should be collapsed");
@@ -363,7 +232,7 @@ var tests = {
         case "pong":
           executeSoon(function() {
             is(numOpened, 1, "only got one open message");
-            chats.removeAll();
+            chats.selectedChat.close();
             port.close();
             next();
           });
@@ -372,86 +241,6 @@ var tests = {
     port.postMessage({topic: "test-init", data: { id: 1 }});
   },
 
-  testSecondTopLevelWindow: function(next) {
-    // Bug 817782 - check chats work in new top-level windows.
-    const chatUrl = SocialSidebar.provider.origin + "/browser/browser/base/content/test/social/social_chat.html";
-    let port = SocialSidebar.provider.getWorkerPort();
-    let secondWindow;
-    port.onmessage = function(e) {
-      if (e.data.topic == "test-init-done") {
-        secondWindow = OpenBrowserWindow();
-        secondWindow.addEventListener("load", function loadListener() {
-          secondWindow.removeEventListener("load", loadListener);
-          port.postMessage({topic: "test-worker-chat", data: chatUrl});
-        });
-      } else if (e.data.topic == "got-chatbox-message") {
-        // the chat was created - let's make sure it was created in the second window.
-        is(secondWindow.SocialChatBar.chatbar.childElementCount, 1);
-        secondWindow.close();
-        next();
-      }
-    }
-    port.postMessage({topic: "test-init"});
-  },
-
-  testChatWindowChooser: function(next) {
-    // Tests that when a worker creates a chat, it is opened in the correct
-    // window.
-    // open a chat (it will open in the main window)
-    ok(!windowHasChats(window), "first window should start with no chats");
-    openChat(SocialSidebar.provider, function() {
-      ok(windowHasChats(window), "first window has the chat");
-      // create a second window - this will be the "most recent" and will
-      // therefore be the window that hosts the new chat (see bug 835111)
-      let secondWindow = OpenBrowserWindow();
-      secondWindow.addEventListener("load", function loadListener() {
-        secondWindow.removeEventListener("load", loadListener);
-        ok(!windowHasChats(secondWindow), "second window has no chats");
-        openChat(SocialSidebar.provider, function() {
-          ok(windowHasChats(secondWindow), "second window now has chats");
-          is(window.SocialChatBar.chatbar.childElementCount, 1, "first window still has 1 chat");
-          window.SocialChatBar.chatbar.removeAll();
-          // now open another chat - it should still open in the second.
-          openChat(SocialSidebar.provider, function() {
-            ok(!windowHasChats(window), "first window has no chats");
-            ok(windowHasChats(secondWindow), "second window has a chat");
-
-            // focus the first window, and open yet another chat - it
-            // should open in the first window.
-            waitForFocus(function() {
-              openChat(SocialSidebar.provider, function() {
-                ok(windowHasChats(window), "first window has chats");
-                window.SocialChatBar.chatbar.removeAll();
-                ok(!windowHasChats(window), "first window has no chats");
-
-                let privateWindow = OpenBrowserWindow({private: true});
-                privateWindow.addEventListener("load", function loadListener() {
-                  privateWindow.removeEventListener("load", loadListener);
-
-                  // open a last chat - the focused window can't accept
-                  // chats (it's a private window), so the chat should open
-                  // in the window that was selected before. This is known
-                  // to be broken on Linux.
-                  openChat(SocialSidebar.provider, function() {
-                    let os = Services.appinfo.OS;
-                    const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
-                    let fn = BROKEN_WM_Z_ORDER ? todo : ok;
-                    fn(windowHasChats(window), "first window has a chat");
-                    window.SocialChatBar.chatbar.removeAll();
-
-                    privateWindow.close();
-                    secondWindow.close();
-                    next();
-                  });
-                });
-              });
-            });
-            window.focus();
-          });
-        });
-      })
-    });
-  },
   testMultipleProviderChat: function(next) {
     // test incomming chats from all providers
     openChat(Social.providers[0], function() {
@@ -467,7 +256,7 @@ var tests = {
               port.postMessage({topic: "test-logout"});
               waitForCondition(function() chats.children.length == Social.providers.length - 1,
                 function() {
-                  chats.removeAll();
+                  closeAllChats();
                   waitForCondition(function() chats.children.length == 0,
                                    function() {
                                     ok(!chats.selectedChat, "multiprovider chats are all closed");
diff --git a/browser/base/content/test/social/browser_social_chatwindowfocus.js b/browser/base/content/test/social/browser_social_chatwindowfocus.js
index 46178e1544c..2f2c0a9ecb9 100644
--- a/browser/base/content/test/social/browser_social_chatwindowfocus.js
+++ b/browser/base/content/test/social/browser_social_chatwindowfocus.js
@@ -9,7 +9,7 @@ function isTabFocused() {
 }
 
 function isChatFocused(chat) {
-  return SocialChatBar.chatbar._isChatFocused(chat);
+  return getChatBar()._isChatFocused(chat);
 }
 
 function openChatViaUser() {
@@ -32,7 +32,7 @@ function openChatViaSidebarMessage(port, data, callback) {
 function openChatViaWorkerMessage(port, data, callback) {
   // sadly there is no message coming back to tell us when the chat has
   // been opened, so we wait until one appears.
-  let chatbar = SocialChatBar.chatbar;
+  let chatbar = getChatBar();
   let numExpected = chatbar.childElementCount + 1;
   port.postMessage({topic: "test-worker-chat", data: data});
   waitForCondition(function() chatbar.childElementCount == numExpected,
@@ -40,12 +40,13 @@ function openChatViaWorkerMessage(port, data, callback) {
                       // so the child has been added, but we don't know if it
                       // has been intialized - re-request it and the callback
                       // means it's done.  Minimized, same as the worker.
-                      SocialChatBar.openChat(SocialSidebar.provider,
-                                             data,
-                                             function() {
-                                                callback();
-                                             },
-                                             "minimized");
+                      chatbar.openChat(SocialSidebar.provider.origin,
+                                       SocialSidebar.provider.name,
+                                       data,
+                                       "minimized",
+                                       function() {
+                                          callback();
+                                       });
                    },
                    "No new chat appeared");
 }
@@ -109,7 +110,7 @@ function test() {
       waitForCondition(function() isTabFocused(), cb, "tab should have focus");
     }
     let postSubTest = function(cb) {
-      window.SocialChatBar.chatbar.removeAll();
+      closeAllChats();
       cb();
     }
     // and run the tests.
@@ -132,21 +133,22 @@ var tests = {
   // Then we do it again - should still not be focused.
   // Then we perform a user-initiated request - it should get focus.
   testNoFocusWhenViaWorker: function(next) {
+    let chatbar = getChatBar();
     startTestAndWaitForSidebar(function(port) {
       openChatViaSidebarMessage(port, {stealFocus: 1}, function() {
         ok(true, "got chatbox message");
-        is(SocialChatBar.chatbar.childElementCount, 1, "exactly 1 chat open");
+        is(chatbar.childElementCount, 1, "exactly 1 chat open");
         ok(isTabFocused(), "tab should still be focused");
         // re-request the same chat via a message.
         openChatViaSidebarMessage(port, {stealFocus: 1}, function() {
-          is(SocialChatBar.chatbar.childElementCount, 1, "still exactly 1 chat open");
+          is(chatbar.childElementCount, 1, "still exactly 1 chat open");
           ok(isTabFocused(), "tab should still be focused");
           // re-request the same chat via user event.
           openChatViaUser();
-          waitForCondition(function() isChatFocused(SocialChatBar.chatbar.selectedChat),
+          waitForCondition(function() isChatFocused(chatbar.selectedChat),
                            function() {
-            is(SocialChatBar.chatbar.childElementCount, 1, "still exactly 1 chat open");
-            is(SocialChatBar.chatbar.selectedChat, SocialChatBar.chatbar.firstElementChild, "chat should be selected");
+            is(chatbar.childElementCount, 1, "still exactly 1 chat open");
+            is(chatbar.selectedChat, chatbar.firstElementChild, "chat should be selected");
             next();
           }, "chat should be focused");
         });
@@ -158,204 +160,14 @@ var tests = {
   // click.  This should cause the new chat to be opened and focused.
   testFocusWhenViaUser: function(next) {
     startTestAndWaitForSidebar(function(port) {
+      let chatbar = getChatBar();
       openChatViaUser();
-      ok(SocialChatBar.chatbar.firstElementChild, "chat opened");
-      waitForCondition(function() isChatFocused(SocialChatBar.chatbar.selectedChat),
+      ok(chatbar.firstElementChild, "chat opened");
+      waitForCondition(function() isChatFocused(chatbar.selectedChat),
                        function() {
-        is(SocialChatBar.chatbar.selectedChat, SocialChatBar.chatbar.firstElementChild, "chat is selected");
+        is(chatbar.selectedChat, chatbar.firstElementChild, "chat is selected");
         next();
       }, "chat should be focused");
     });
   },
-
-  // Open a chat via the worker - it will open and not have focus.
-  // Then open the same chat via a sidebar message - it will be restored but
-  // should still not have grabbed focus.
-  testNoFocusOnAutoRestore: function(next) {
-    const chatUrl = "https://example.com/browser/browser/base/content/test/social/social_chat.html?id=1";
-    let chatbar = SocialChatBar.chatbar;
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaWorkerMessage(port, chatUrl, function() {
-        is(chatbar.childElementCount, 1, "exactly 1 chat open");
-        // bug 865086 opening minimized still sets the window as selected
-        todo(chatbar.selectedChat != chatbar.firstElementChild, "chat is not selected");
-        ok(isTabFocused(), "tab should be focused");
-        openChatViaSidebarMessage(port, {stealFocus: 1, id: 1}, function() {
-          is(chatbar.childElementCount, 1, "still 1 chat open");
-          ok(!chatbar.firstElementChild.minimized, "chat no longer minimized");
-          // bug 865086 because we marked it selected on open, it still is
-          todo(chatbar.selectedChat != chatbar.firstElementChild, "chat is not selected");
-          ok(isTabFocused(), "tab should still be focused");
-          next();
-        });
-      });
-    });
-  },
-
-  // Here we open a chat, which will not be focused.  Then we minimize it and
-  // restore it via a titlebar clock - it should get focus at that point.
-  testFocusOnExplicitRestore: function(next) {
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaSidebarMessage(port, {stealFocus: 1}, function() {
-        ok(true, "got chatbox message");
-        ok(isTabFocused(), "tab should still be focused");
-        let chatbox = SocialChatBar.chatbar.firstElementChild;
-        ok(chatbox, "chat opened");
-        chatbox.minimized = true;
-        ok(isTabFocused(), "tab should still be focused");
-        // pretend we clicked on the titlebar
-        chatbox.onTitlebarClick({button: 0});
-        waitForCondition(function() isChatFocused(SocialChatBar.chatbar.selectedChat),
-                         function() {
-          ok(!chatbox.minimized, "chat should have been restored");
-          ok(isChatFocused(chatbox), "chat should be focused");
-          is(chatbox, SocialChatBar.chatbar.selectedChat, "chat is marked selected");
-          next();
-        }, "chat should have focus");
-      });
-    });
-  },
-
-  // Open 2 chats and give 1 focus.  Minimize the focused one - the second
-  // should get focus.
-  testMinimizeFocused: function(next) {
-    let chatbar = SocialChatBar.chatbar;
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaSidebarMessage(port, {stealFocus: 1, id: 1}, function() {
-        let chat1 = chatbar.firstElementChild;
-        openChatViaSidebarMessage(port, {stealFocus: 1, id: 2}, function() {
-          is(chatbar.childElementCount, 2, "exactly 2 chats open");
-          let chat2 = chat1.nextElementSibling || chat1.previousElementSibling;
-          chatbar.selectedChat = chat1;
-          chatbar.focus();
-          waitForCondition(function() isChatFocused(chat1),
-                           function() {
-            is(chat1, SocialChatBar.chatbar.selectedChat, "chat1 is marked selected");
-            isnot(chat2, SocialChatBar.chatbar.selectedChat, "chat2 is not marked selected");
-            chat1.minimized = true;
-            waitForCondition(function() isChatFocused(chat2),
-                             function() {
-              // minimizing the chat with focus should give it to another.
-              isnot(chat1, SocialChatBar.chatbar.selectedChat, "chat1 is not marked selected");
-              is(chat2, SocialChatBar.chatbar.selectedChat, "chat2 is marked selected");
-              next();
-            }, "chat2 should have focus");
-          }, "chat1 should have focus");
-        });
-      });
-    });
-  },
-
-  // Open 2 chats, select (but not focus) one, then re-request it be
-  // opened via a message.  Focus should not move.
-  testReopenNonFocused: function(next) {
-    let chatbar = SocialChatBar.chatbar;
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaSidebarMessage(port, {id: 1}, function() {
-        let chat1 = chatbar.firstElementChild;
-        openChatViaSidebarMessage(port, {id: 2}, function() {
-          let chat2 = chat1.nextElementSibling || chat1.previousElementSibling;
-          chatbar.selectedChat = chat2;
-          // tab still has focus
-          ok(isTabFocused(), "tab should still be focused");
-          // re-request the first.
-          openChatViaSidebarMessage(port, {id: 1}, function() {
-            is(chatbar.selectedChat, chat1, "chat1 now selected");
-            ok(isTabFocused(), "tab should still be focused");
-            next();
-          });
-        });
-      });
-    });
-  },
-
-  // Open 2 chats, select and focus the second.  Pressing the TAB key should
-  // cause focus to move between all elements in our chat window before moving
-  // to the next chat window.
-  testTab: function(next) {
-    function sendTabAndWaitForFocus(chat, eltid, callback) {
-      // ideally we would use the 'focus' event here, but that doesn't work
-      // as expected for the iframe - the iframe itself never gets the focus
-      // event (apparently the sub-document etc does.)
-      // So just poll for the correct element getting focus...
-      let doc = chat.contentDocument;
-      EventUtils.sendKey("tab");
-      waitForCondition(function() {
-        let elt = eltid ? doc.getElementById(eltid) : doc.documentElement;
-        return doc.activeElement == elt;
-      }, callback, "element " + eltid + " never got focus");
-    }
-
-    let chatbar = SocialChatBar.chatbar;
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaSidebarMessage(port, {id: 1}, function() {
-        let chat1 = chatbar.firstElementChild;
-        openChatViaSidebarMessage(port, {id: 2}, function() {
-          let chat2 = chat1.nextElementSibling || chat1.previousElementSibling;
-          chatbar.selectedChat = chat2;
-          chatbar.focus();
-          waitForCondition(function() isChatFocused(chatbar.selectedChat),
-                           function() {
-            // Our chats have 3 focusable elements, so it takes 4 TABs to move
-            // to the new chat.
-            sendTabAndWaitForFocus(chat2, "input1", function() {
-              is(chat2.contentDocument.activeElement.getAttribute("id"), "input1",
-                 "first input field has focus");
-              ok(isChatFocused(chat2), "new chat still focused after first tab");
-              sendTabAndWaitForFocus(chat2, "input2", function() {
-                ok(isChatFocused(chat2), "new chat still focused after tab");
-                is(chat2.contentDocument.activeElement.getAttribute("id"), "input2",
-                   "second input field has focus");
-                sendTabAndWaitForFocus(chat2, "iframe", function() {
-                  ok(isChatFocused(chat2), "new chat still focused after tab");
-                  is(chat2.contentDocument.activeElement.getAttribute("id"), "iframe",
-                     "iframe has focus");
-                  // this tab now should move to the next chat, but focus the
-                  // document element itself (hence the null eltid)
-                  sendTabAndWaitForFocus(chat1, null, function() {
-                    ok(isChatFocused(chat1), "first chat is focused");
-                    next();
-                  });
-                });
-              });
-            });
-          }, "chat should have focus");
-        });
-      });
-    });
-  },
-
-  // Open a chat and focus an element other than the first. Move focus to some
-  // other item (the tab itself in this case), then focus the chatbar - the
-  // same element that was previously focused should still have focus.
-  testFocusedElement: function(next) {
-    let chatbar = SocialChatBar.chatbar;
-    startTestAndWaitForSidebar(function(port) {
-      openChatViaUser();
-      let chat = chatbar.firstElementChild;
-      // need to wait for the content to load before we can focus it.
-      chat.addEventListener("DOMContentLoaded", function DOMContentLoaded() {
-        chat.removeEventListener("DOMContentLoaded", DOMContentLoaded);
-        chat.contentDocument.getElementById("input2").focus();
-        waitForCondition(function() isChatFocused(chat),
-                         function() {
-          is(chat.contentDocument.activeElement.getAttribute("id"), "input2",
-             "correct input field has focus");
-          // set focus to the tab.
-          let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
-          Services.focus.moveFocus(tabb.contentWindow, null, Services.focus.MOVEFOCUS_ROOT, 0);
-          waitForCondition(function() isTabFocused(),
-                           function() {
-            chatbar.focus();
-            waitForCondition(function() isChatFocused(chat),
-                             function() {
-              is(chat.contentDocument.activeElement.getAttribute("id"), "input2",
-                 "correct input field still has focus");
-              next();
-            }, "chat took focus");
-          }, "tab has focus");
-        }, "chat took focus");
-      });
-    });
-  },
 };
diff --git a/browser/base/content/test/social/browser_social_errorPage.js b/browser/base/content/test/social/browser_social_errorPage.js
index 8209dbd4c2f..9bb35eed65b 100644
--- a/browser/base/content/test/social/browser_social_errorPage.js
+++ b/browser/base/content/test/social/browser_social_errorPage.js
@@ -9,6 +9,8 @@ function gc() {
   wu.garbageCollect();
 }
 
+let openChatWindow = Cu.import("resource://gre/modules/MozSocialAPI.jsm", {}).openChatWindow;
+
 // Support for going on and offline.
 // (via browser/base/content/test/browser_bookmark_titles.js)
 let origProxyType = Services.prefs.getIntPref('network.proxy.type');
@@ -42,9 +44,10 @@ function openPanel(url, panelCallback, loadCallback) {
 
 function openChat(url, panelCallback, loadCallback) {
   // open a chat window
-  SocialChatBar.openChat(SocialSidebar.provider, url, panelCallback);
-  SocialChatBar.chatbar.firstChild.addEventListener("DOMContentLoaded", function panelLoad() {
-    SocialChatBar.chatbar.firstChild.removeEventListener("DOMContentLoaded", panelLoad, true);
+  let chatbar = getChatBar();
+  openChatWindow(null, SocialSidebar.provider, url, panelCallback);
+  chatbar.firstChild.addEventListener("DOMContentLoaded", function panelLoad() {
+    chatbar.firstChild.removeEventListener("DOMContentLoaded", panelLoad, true);
     loadCallback();
   }, true);
 }
@@ -154,7 +157,7 @@ var tests = {
 
   testChatWindow: function(next) {
     let panelCallbackCount = 0;
-    // go offline and open a flyout.
+    // go offline and open a chat.
     goOffline();
     openChat(
       "https://example.com/browser/browser/base/content/test/social/social_chat.html",
@@ -164,7 +167,7 @@ var tests = {
       function() { // the "load" callback.
         executeSoon(function() {
           todo_is(panelCallbackCount, 0, "Bug 833207 - should be no callback when error page loads.");
-          let chat = SocialChatBar.chatbar.selectedChat;
+          let chat = getChatBar().selectedChat;
           waitForCondition(function() chat.contentDocument.location.href.indexOf("about:socialerror?")==0,
                            function() {
                             chat.close();
@@ -186,7 +189,7 @@ var tests = {
       null,
       function() { // the "load" callback.
         executeSoon(function() {
-          let chat = SocialChatBar.chatbar.selectedChat;
+          let chat = getChatBar().selectedChat;
           is(chat.contentDocument.location.href, url, "correct url loaded");
           // toggle to a detached window.
           chat.swapWindows().then(
diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js
index 1747a3c7223..2369533ade9 100644
--- a/browser/base/content/test/social/head.js
+++ b/browser/base/content/test/social/head.js
@@ -399,7 +399,7 @@ function get3ChatsForCollapsing(mode, cb) {
   // To make our life easier we don't go via the worker and ports so we get
   // more control over creation *and* to make the code much simpler.  We
   // assume the worker/port stuff is individually tested above.
-  let chatbar = window.SocialChatBar.chatbar;
+  let chatbar = getChatBar();
   let chatWidth = undefined;
   let num = 0;
   is(chatbar.childNodes.length, 0, "chatbar starting empty");
@@ -443,23 +443,21 @@ function makeChat(mode, uniqueid, cb) {
   info("making a chat window '" + uniqueid +"'");
   let provider = SocialSidebar.provider;
   const chatUrl = provider.origin + "/browser/browser/base/content/test/social/social_chat.html";
-  let isOpened = window.SocialChatBar.openChat(provider, chatUrl + "?id=" + uniqueid, function(chat) {
+  // Note that we use promiseChatLoaded instead of the callback to ensure the
+  // content has started loading.
+  let chatbox = getChatBar().openChat(provider.origin, provider.name,
+                                      chatUrl + "?id=" + uniqueid, mode);
+  chatbox.promiseChatLoaded.then(
+    () => {
     info("chat window has opened");
-    // we can't callback immediately or we might close the chat during
-    // this event which upsets the implementation - it is only 1/2 way through
-    // handling the load event.
-    chat.document.title = uniqueid;
-    executeSoon(cb);
-  }, mode);
-  if (!isOpened) {
-    ok(false, "unable to open chat window, no provider? more failures to come");
-    executeSoon(cb);
-  }
+    chatbox.contentDocument.title = uniqueid;
+    cb();
+  });
 }
 
 function checkPopup() {
   // popup only showing if any collapsed popup children.
-  let chatbar = window.SocialChatBar.chatbar;
+  let chatbar = getChatBar();
   let numCollapsed = 0;
   for (let chat of chatbar.childNodes) {
     if (chat.collapsed) {
@@ -478,7 +476,7 @@ function checkPopup() {
 // Does a callback passing |true| if the window is now big enough or false
 // if we couldn't resize large enough to satisfy the test requirement.
 function resizeWindowToChatAreaWidth(desired, cb, count = 0) {
-  let current = window.SocialChatBar.chatbar.getBoundingClientRect().width;
+  let current = getChatBar().getBoundingClientRect().width;
   let delta = desired - current;
   info(count + ": resizing window so chat area is " + desired + " wide, currently it is "
        + current + ".  Screen avail is " + window.screen.availWidth
@@ -511,7 +509,7 @@ function resizeWindowToChatAreaWidth(desired, cb, count = 0) {
   }
   function resize_handler(event) {
     // we did resize - but did we get far enough to be able to continue?
-    let newSize = window.SocialChatBar.chatbar.getBoundingClientRect().width;
+    let newSize = getChatBar().getBoundingClientRect().width;
     let sizedOk = widthDeltaCloseEnough(newSize - desired);
     if (!sizedOk)
       return;
@@ -559,8 +557,13 @@ function resizeAndCheckWidths(first, second, third, checks, cb) {
   }, count);
 }
 
+function getChatBar() {
+  return document.getElementById("pinnedchats");
+}
+
 function getPopupWidth() {
-  let popup = window.SocialChatBar.chatbar.menupopup;
+  let chatbar = getChatBar();
+  let popup = chatbar.menupopup;
   ok(!popup.parentNode.collapsed, "asking for popup width when it is visible");
   let cs = document.defaultView.getComputedStyle(popup.parentNode);
   let margins = parseInt(cs.marginLeft) + parseInt(cs.marginRight);
@@ -568,6 +571,8 @@ function getPopupWidth() {
 }
 
 function closeAllChats() {
-  let chatbar = window.SocialChatBar.chatbar;
-  chatbar.removeAll();
+  let chatbar = getChatBar();
+  while (chatbar.selectedChat) {
+    chatbar.selectedChat.close();
+  }
 }
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 64b0f6fd20f..5f2851b7baa 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -13,6 +13,7 @@ MOCHITEST_CHROME_MANIFESTS += [
 ]
 
 BROWSER_CHROME_MANIFESTS += [
+    'content/test/chat/browser.ini',
     'content/test/general/browser.ini',
     'content/test/newtab/browser.ini',
     'content/test/plugins/browser.ini',

From f8ee4edca0cb3b40a20b6886c745bbeaf1630935 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Wed, 7 May 2014 02:36:18 +0200
Subject: [PATCH 06/11] Bug 1002456 - Fix debugger server breakage;r=jimb

---
 toolkit/devtools/server/actors/script.js | 36 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index 0d8201ca130..89c538197bd 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -14,7 +14,7 @@ const { DebuggerServer } = require("devtools/server/main");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const { dbg_assert, dumpn, update } = DevToolsUtils;
 const { SourceMapConsumer, SourceMapGenerator } = require("source-map");
-const { all, defer, resolve } = promise;
+const { defer, resolve, reject, all } = require("devtools/toolkit/deprecated-sync-thenables");
 
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
@@ -37,7 +37,7 @@ let addonManager = null;
  * about them.
  */
 function mapURIToAddonID(uri, id) {
-  if (Services.appinfo.ID == B2G_ID) {
+  if ((Services.appinfo.ID || undefined) == B2G_ID) {
     return false;
   }
 
@@ -3041,6 +3041,7 @@ let stringifiers = {
  */
 function ObjectActor(aObj, aThreadActor)
 {
+  dbg_assert(!aObj.optimizedOut, "Should not create object actors for optimized out values!");
   this.obj = aObj;
   this.threadActor = aThreadActor;
 }
@@ -4552,10 +4553,16 @@ EnvironmentActor.prototype = {
     }
     for each (let name in parameterNames) {
       let arg = {};
+
+      let value = this.obj.getVariable(name);
+      if (value && value.optimizedOut) {
+        continue;
+      }
+
       // TODO: this part should be removed in favor of the commented-out part
       // below when getVariableDescriptor lands (bug 725815).
       let desc = {
-        value: this.obj.getVariable(name),
+        value: value,
         configurable: false,
         writable: true,
         enumerable: true
@@ -4584,15 +4591,12 @@ EnvironmentActor.prototype = {
         continue;
       }
 
-      // TODO: this part should be removed in favor of the commented-out part
-      // below when getVariableDescriptor lands.
-      let desc = {
-        configurable: false,
-        writable: true,
-        enumerable: true
-      };
+      let value;
       try {
-        desc.value = this.obj.getVariable(name);
+        value = this.obj.getVariable(name);
+        if (value && value.optimizedOut) {
+          continue;
+        }
       } catch (e) {
         // Avoid "Debugger scope is not live" errors for |arguments|, introduced
         // in bug 746601.
@@ -4600,6 +4604,16 @@ EnvironmentActor.prototype = {
           throw e;
         }
       }
+
+      // TODO: this part should be removed in favor of the commented-out part
+      // below when getVariableDescriptor lands.
+      let desc = {
+        value: value,
+        configurable: false,
+        writable: true,
+        enumerable: true
+      };
+
       //let desc = this.obj.getVariableDescriptor(name);
       let descForm = {
         enumerable: true,

From a0817e7c19237ca497b80ea21503078dad05193e Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@gmail.com>
Date: Tue, 6 May 2014 17:07:00 +0200
Subject: [PATCH 07/11] Bug 1006287 - Clicking a graph node in the audio dev
 tool focuses the param view for the node. r=vp

---
 .../devtools/webaudioeditor/test/browser.ini  |  2 +-
 .../test/browser_wa_graph_click.js            | 58 +++++++++++++++++++
 .../test/browser_wa_graph_mouseover.js        | 42 --------------
 .../webaudioeditor/webaudioeditor-view.js     | 34 +++++++++--
 4 files changed, 87 insertions(+), 49 deletions(-)
 create mode 100644 browser/devtools/webaudioeditor/test/browser_wa_graph_click.js
 delete mode 100644 browser/devtools/webaudioeditor/test/browser_wa_graph_mouseover.js

diff --git a/browser/devtools/webaudioeditor/test/browser.ini b/browser/devtools/webaudioeditor/test/browser.ini
index 6420cfb93ed..3a5cae5e39f 100644
--- a/browser/devtools/webaudioeditor/test/browser.ini
+++ b/browser/devtools/webaudioeditor/test/browser.ini
@@ -16,7 +16,7 @@ support-files =
 
 [browser_wa_first-run.js]
 
-[browser_wa_graph_mouseover.js]
+[browser_wa_graph_click.js]
 [browser_wa_graph_render_01.js]
 [browser_wa_graph_render_02.js]
 
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph_click.js b/browser/devtools/webaudioeditor/test/browser_wa_graph_click.js
new file mode 100644
index 00000000000..cfe4b999a65
--- /dev/null
+++ b/browser/devtools/webaudioeditor/test/browser_wa_graph_click.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the ParamsList view opens the correct node when clicking
+ * on the node in the GraphView
+ */
+
+function spawnTest() {
+  let [target, debuggee, panel] = yield initWebAudioEditor(COMPLEX_CONTEXT_URL);
+  let panelWin = panel.panelWin;
+  let { gFront, $, $$, EVENTS, WebAudioParamView } = panelWin;
+  let gVars = WebAudioParamView._paramsView;
+
+  let started = once(gFront, "start-context");
+
+  reload(target);
+
+  let [_, nodes, _] = yield Promise.all([
+    getN(gFront, "create-node", 8),
+    getNSpread(panel.panelWin, EVENTS.UI_ADD_NODE_LIST, 8),
+    waitForGraphRendered(panel.panelWin, 8, 8)
+  ]);
+
+  let nodeIds = nodes.map(([e, id]) => id);
+
+  for (let i = 0; i < 8; i++) {
+    ok(!isExpanded(gVars, i), "no views expanded on default");
+  }
+
+  click(panel.panelWin, findGraphNode(panelWin, nodeIds[1]));
+  ok(isExpanded(gVars, 1), "params view expanded on click");
+
+  var allClosed = true;
+  for (let i = 0; i < 8; i++) {
+    if (i === 1) continue;
+    if (isExpanded(gVars, i))
+      allClosed = false;
+  }
+  ok(allClosed, "all other param views are still minimized");
+
+  click(panel.panelWin, findGraphNode(panelWin, nodeIds[2]));
+  ok(isExpanded(gVars, 2), "second params view expanded on click");
+
+  click(panel.panelWin, $("rect", findGraphNode(panelWin, nodeIds[3])));
+  ok(isExpanded(gVars, 3), "param view opens when clicking `<rect>`");
+
+  click(panel.panelWin, $("tspan", findGraphNode(panelWin, nodeIds[4])));
+  ok(isExpanded(gVars, 4), "param view opens when clicking `<tspan>`");
+
+  yield teardown(panel);
+  finish();
+}
+
+function isExpanded (view, index) {
+  let scope = view.getScopeAtIndex(index);
+  return scope.expanded;
+}
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph_mouseover.js b/browser/devtools/webaudioeditor/test/browser_wa_graph_mouseover.js
deleted file mode 100644
index 454a5800d04..00000000000
--- a/browser/devtools/webaudioeditor/test/browser_wa_graph_mouseover.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the shader editor shows the appropriate UI when opened.
- */
-
-function spawnTest() {
-  let [target, debuggee, panel] = yield initWebAudioEditor(COMPLEX_CONTEXT_URL);
-  let { gFront, $, $$, EVENTS, WebAudioParamView } = panel.panelWin;
-  let gVars = WebAudioParamView._paramsView;
-
-  let started = once(gFront, "start-context");
-
-  reload(target);
-
-  yield Promise.all([
-    getN(gFront, "create-node", 8),
-    getNSpread(panel.panelWin, EVENTS.UI_ADD_NODE_LIST, 8),
-    waitForGraphRendered(panel.panelWin, 8, 8)
-  ]);
-
-  let $items = $$(".variables-view-scope");
-  let $graphNodes = $$(".nodes > g");
-
-  for (let $item of $items) {
-    mouseOver(panel.panelWin, $(".devtools-toolbar", $item));
-    // Get actorID from id of variable scope
-    let id = $item.id.match(/\(([^\)]*)\)/)[1];
-
-    // Go over all graph nodes and check only the selected one is highlighted
-    for (let $node of $graphNodes) {
-      let shouldBeSelected = id === $node.getAttribute("data-id");
-      ok($node.classList.contains("selected") === shouldBeSelected,
-        "graph node correctly " + (shouldBeSelected ? "" : "not ") + "highlighted on param view mouseover");
-    }
-  }
-
-  yield teardown(panel);
-  finish();
-}
-
diff --git a/browser/devtools/webaudioeditor/webaudioeditor-view.js b/browser/devtools/webaudioeditor/webaudioeditor-view.js
index 0e6e2772a7d..6baad9f62cb 100644
--- a/browser/devtools/webaudioeditor/webaudioeditor-view.js
+++ b/browser/devtools/webaudioeditor/webaudioeditor-view.js
@@ -40,6 +40,7 @@ let WebAudioGraphView = {
   initialize: function() {
     this._onGraphNodeClick = this._onGraphNodeClick.bind(this);
     this.draw = debounce(this.draw.bind(this), GRAPH_DEBOUNCE_TIMER);
+    $('#graph-target').addEventListener('click', this._onGraphNodeClick, false);
   },
 
   /**
@@ -49,6 +50,7 @@ let WebAudioGraphView = {
     if (this._zoomBinding) {
       this._zoomBinding.on("zoom", null);
     }
+    $('#graph-target').removeEventListener('click', this._onGraphNodeClick, false);
   },
 
   /**
@@ -140,7 +142,7 @@ let WebAudioGraphView = {
       let svgNodes = oldDrawNodes(graph, root);
       svgNodes.attr("class", (n) => {
         let node = graph.node(n);
-        return "type-" + node.label;
+        return "audionode type-" + node.label;
       });
       svgNodes.attr("data-id", (n) => {
         let node = graph.node(n);
@@ -214,12 +216,16 @@ let WebAudioGraphView = {
   /**
    * Fired when a node in the svg graph is clicked. Used to handle triggering the AudioNodePane.
    *
-   * @param Object AudioNodeView
-   *        The object stored in `AudioNodes` which contains render information, but most importantly,
-   *        the actorID under `id` property.
+   * @param Event e
+   *        Click event.
    */
-  _onGraphNodeClick: function (node) {
-    WebAudioParamView.focusNode(node.id);
+  _onGraphNodeClick: function (e) {
+    let node = findGraphNodeParent(e.target);
+    // If node not found (clicking outside of an audio node in the graph),
+    // then ignore this event
+    if (!node)
+      return;
+    WebAudioParamView.focusNode(node.getAttribute('data-id'));
   }
 };
 
@@ -370,3 +376,19 @@ let WebAudioParamView = {
 
   })
 };
+
+/**
+ * Takes an element in an SVG graph and iterates over
+ * ancestors until it finds the graph node container. If not found,
+ * returns null.
+ */
+
+function findGraphNodeParent (el) {
+  while (!el.classList.contains("nodes")) {
+    if (el.classList.contains("audionode"))
+      return el;
+    else
+      el = el.parentNode;
+  }
+  return null;
+}

From 9de613ba226ffaaa35825f9863738071231839a0 Mon Sep 17 00:00:00 2001
From: Robert Utasi <utasir@freestart.hu>
Date: Wed, 7 May 2014 00:04:57 +0200
Subject: [PATCH 08/11] Bug 1001204 - Remove hyperlink appearance for
 nsIAlertsService alerts when clickable. r=MattN

---
 toolkit/themes/linux/global/alerts/alert.css   | 14 +++++---------
 toolkit/themes/osx/global/alerts/alert.css     | 14 +++++---------
 toolkit/themes/windows/global/alerts/alert.css | 14 +++++---------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/toolkit/themes/linux/global/alerts/alert.css b/toolkit/themes/linux/global/alerts/alert.css
index 7343e8ce786..1acc221948a 100644
--- a/toolkit/themes/linux/global/alerts/alert.css
+++ b/toolkit/themes/linux/global/alerts/alert.css
@@ -33,6 +33,11 @@
   background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1));
 }
 
+#alertNotification[clickable="true"]:hover .alertTextBox,
+#alertNotification[clickable="true"]:hover .alertCloseBox {
+  background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3));
+}
+
 .alertTitle {
   font-weight: bold;
   font-size: 110%;
@@ -52,15 +57,6 @@ label {
   cursor: inherit;
 }
 
-.alertText[clickable="true"] {
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-}
-
-.alertText[clickable="true"]:hover:active {
-  color: -moz-activehyperlinktext;
-}
-
 .alertCloseButton {
   -moz-appearance: none;
   height: 16px;
diff --git a/toolkit/themes/osx/global/alerts/alert.css b/toolkit/themes/osx/global/alerts/alert.css
index 8e30e188530..29f8016f111 100644
--- a/toolkit/themes/osx/global/alerts/alert.css
+++ b/toolkit/themes/osx/global/alerts/alert.css
@@ -45,6 +45,11 @@
   background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1));
 }
 
+#alertNotification[clickable="true"]:hover .alertTextBox,
+#alertNotification[clickable="true"]:hover .alertCloseBox {
+  background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3));
+}
+
 .alertTitle {
   font-weight: bold;
   font-size: 110%;
@@ -64,15 +69,6 @@ label {
   cursor: inherit;
 }
 
-.alertText[clickable="true"] {
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-}
-
-.alertText[clickable="true"]:hover:active {
-  color: -moz-activehyperlinktext;
-}
-
 @keyframes alert-animation {
   from {
     opacity: 0;
diff --git a/toolkit/themes/windows/global/alerts/alert.css b/toolkit/themes/windows/global/alerts/alert.css
index 06f36038f7a..2be89987d17 100644
--- a/toolkit/themes/windows/global/alerts/alert.css
+++ b/toolkit/themes/windows/global/alerts/alert.css
@@ -34,6 +34,11 @@
   background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1));
 }
 
+#alertNotification[clickable="true"]:hover .alertTextBox,
+#alertNotification[clickable="true"]:hover .alertCloseBox {
+  background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3));
+}
+
 .alertTitle {
   font-weight: bold;
   font-size: 110%;
@@ -53,15 +58,6 @@ label {
   cursor: inherit;
 }
 
-.alertText[clickable="true"] {
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-}
-
-.alertText[clickable="true"]:hover:active {
-  color: -moz-activehyperlinktext;
-}
-
 @keyframes alert-animation {
   from {
     opacity: 0;

From 3268be97830c2225189a82fda9aac777193622dc Mon Sep 17 00:00:00 2001
From: Maksim Lebedev <alessarik@gmail.com>
Date: Tue, 29 Apr 2014 05:41:00 +0200
Subject: [PATCH 09/11] Bug 1003093 - Fire pointerOUT event after firing
 pointerCANCEL event. r=smaug

---
 dom/events/EventStateManager.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index b0fdc6231ab..d7ad3b8810f 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -557,11 +557,6 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     }
     break;
   }
-  case NS_POINTER_CANCEL:
-  {
-    GenerateMouseEnterExit(mouseEvent);
-    break;
-  }
   case NS_MOUSE_EXIT:
     // If the event is not a top-level window exit, then it's not
     // really an exit --- we may have traversed widget boundaries but
@@ -2864,7 +2859,13 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
       SetActiveManager(this, activeContent);
     }
     break;
-  case NS_POINTER_CANCEL:
+  case NS_POINTER_CANCEL: {
+    if(WidgetMouseEvent* mouseEvent = aEvent->AsMouseEvent()) {
+      GenerateMouseEnterExit(mouseEvent);
+    }
+    // This break was commented specially
+    // break;
+  }
   case NS_POINTER_UP: {
     WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent();
     // After UP/Cancel Touch pointers become invalid so we can remove relevant helper from Table

From 804045289f54549a06fa0aeae094a0695d2983ed Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Mon, 5 May 2014 22:54:57 +0200
Subject: [PATCH 10/11] Bug 989890 - Port the help button to in-content prefs.
 r=jaws

---
 .../preferences/in-content/advanced.xul       |  10 +--
 .../preferences/in-content/preferences.js     |  10 ++-
 .../preferences/in-content/preferences.xul    |  61 ++++++++++++++----
 .../browser/preferences/preferences.dtd       |   4 +-
 browser/themes/linux/jar.mn                   |   2 +
 browser/themes/osx/jar.mn                     |   2 +
 .../shared/incontentprefs/help-glyph.png      | Bin 0 -> 280 bytes
 .../shared/incontentprefs/help-glyph@2x.png   | Bin 0 -> 500 bytes
 .../shared/incontentprefs/preferences.css     |  42 ++++++++++++
 browser/themes/windows/jar.mn                 |   4 ++
 10 files changed, 114 insertions(+), 21 deletions(-)
 create mode 100644 browser/themes/shared/incontentprefs/help-glyph.png
 create mode 100644 browser/themes/shared/incontentprefs/help-glyph@2x.png

diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/components/preferences/in-content/advanced.xul
index 2f4d0c369ca..b242c936918 100644
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -138,13 +138,13 @@
         onselect="gAdvancedPane.tabSelectionChanged();">
 
   <tabs id="tabsElement">
-    <tab id="generalTab" label="&generalTab.label;" helpTopic="prefs-advanced-general"/>
+    <tab id="generalTab" label="&generalTab.label;"/>
 #ifdef MOZ_DATA_REPORTING
-    <tab id="dataChoicesTab" label="&dataChoicesTab.label;" helpTopic="prefs-advanced-data-choices"/>
+    <tab id="dataChoicesTab" label="&dataChoicesTab.label;"/>
 #endif
-    <tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/>
-    <tab id="updateTab" label="&updateTab.label;"  helpTopic="prefs-advanced-update"/>
-    <tab id="encryptionTab" label="&certificateTab.label;" helpTopic="prefs-advanced-encryption"/>
+    <tab id="networkTab" label="&networkTab.label;"/>
+    <tab id="updateTab" label="&updateTab.label;"/>
+    <tab id="encryptionTab" label="&certificateTab.label;"/>
   </tabs>
 
   <tabpanels flex="1">
diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js
index 7630cca7a1d..d5f74b73f9f 100644
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -55,6 +55,14 @@ function search(aQuery, aAttribute) {
   let elements = document.getElementById("mainPrefPane").children;
   for (let element of elements) {
     let attributeValue = element.getAttribute(aAttribute);
-    element.hidden = (attributeValue != aQuery);
+    element.hidden = (attributeValue && attributeValue != aQuery);
   }
 }
+
+function helpButtonCommand() {
+  let pane = history.state;
+  let categories = document.getElementById("categories");
+  let helpTopic = categories.querySelector(".category[value=" + pane + "]")
+                            .getAttribute("helpTopic");
+  openHelpLink(helpTopic);
+}
diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index 1321a41e58c..29febabfb18 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -78,46 +78,74 @@
 
     <!-- category list -->
     <richlistbox id="categories">
-      <richlistitem id="category-general" class="category" align="center"
-                    value="paneGeneral" tooltiptext="&paneGeneral.title;">
+      <richlistitem id="category-general"
+                    class="category"
+                    value="paneGeneral"
+                    helpTopic="prefs-main"
+                    tooltiptext="&paneGeneral.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneGeneral.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-content" class="category" align="center"
-                    value="paneContent" tooltiptext="&paneContent.title;">
+      <richlistitem id="category-content"
+                    class="category"
+                    value="paneContent"
+                    helpTopic="prefs-content"
+                    tooltiptext="&paneContent.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneContent.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-application" class="category" align="center"
-                    value="paneApplications" tooltiptext="&paneApplications.title;">
+      <richlistitem id="category-application"
+                    class="category"
+                    value="paneApplications"
+                    helpTopic="prefs-applications"
+                    tooltiptext="&paneApplications.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneApplications.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-privacy" class="category" align="center"
-                    value="panePrivacy" tooltiptext="&panePrivacy.title;">
+      <richlistitem id="category-privacy"
+                    class="category"
+                    value="panePrivacy"
+                    helpTopic="prefs-privacy"
+                    tooltiptext="&panePrivacy.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&panePrivacy.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-security" class="category" align="center"
-                    value="paneSecurity" tooltiptext="&paneSecurity.title;">
+      <richlistitem id="category-security"
+                    class="category"
+                    value="paneSecurity"
+                    helpTopic="prefs-security"
+                    tooltiptext="&paneSecurity.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneSecurity.title;"/>
       </richlistitem>
 
 #ifdef MOZ_SERVICES_SYNC
-      <richlistitem id="category-sync" class="category" align="center"
-                    value="paneSync" tooltiptext="&paneSync.title;">
+      <richlistitem id="category-sync"
+                    class="category"
+                    value="paneSync"
+                    helpTopic="prefs-weave"
+                    tooltiptext="&paneSync.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneSync.title;"/>
       </richlistitem>
 #endif
 
-      <richlistitem id="category-advanced" class="category" align="center"
-                    value="paneAdvanced" tooltiptext="&paneAdvanced.title;">
+      <richlistitem id="category-advanced"
+                    class="category"
+                    value="paneAdvanced"
+                    helpTopic="prefs-advanced-general"
+                    tooltiptext="&paneAdvanced.title;"
+                    align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneAdvanced.title;"/>
       </richlistitem>
@@ -134,6 +162,11 @@
 #ifdef MOZ_SERVICES_SYNC
 #include sync.xul
 #endif
+        <hbox pack="end">
+          <button class="help-button"
+                  aria-label="&helpButton.label;"
+                  oncommand="helpButtonCommand();"/>
+        </hbox>
       </prefpane>
     </box>
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
index 41cfc0cf23e..0cbb24577cd 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -22,4 +22,6 @@
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
 <!ENTITY  buttonForward.tooltip   "Go forward one page">
-<!ENTITY  buttonBack.tooltip      "Go back one page">
\ No newline at end of file
+<!ENTITY  buttonBack.tooltip      "Go back one page">
+
+<!ENTITY  helpButton.label        "Help">
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 051a4976943..002e0ec27b6 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -140,6 +140,8 @@ browser.jar:
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
   skin/classic/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
   skin/classic/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
+  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
+  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
   skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
   skin/classic/browser/preferences/in-content/dropdown@2x.png (../shared/incontentprefs/dropdown@2x.png)
   skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index af28ee7f82f..fb55508e023 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -230,6 +230,8 @@ browser.jar:
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
   skin/classic/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
   skin/classic/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
+  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
+  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
   skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
   skin/classic/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
   skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
diff --git a/browser/themes/shared/incontentprefs/help-glyph.png b/browser/themes/shared/incontentprefs/help-glyph.png
new file mode 100644
index 0000000000000000000000000000000000000000..4943f1bb509f4a56ea2d305bca57647114777d90
GIT binary patch
literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F0002rNkl<Zc-muN
z7zLwXC;%p!nXI6oz+q_P-eG9#ehP?x8riyi0P=V1S~*)%)gmJsk5xu?9{+)s+yt|2
z-OqyfK>E9`v5PJ>?P4~ta`6WF49aITv~hb1vP|FFHG^hBsb}G21hnWM$Ra%(H*=cA
z6)=7ZL2(2QN;|iuH1Ua%jr(S3T>Uh%acf{;&}O5FMTWL+dm-`So<q|NWMJ*m1xnU>
zHqIV2wMfm<N!q~L)k|DYkDI0z0psWlIF77c8)<40FcEAtwDI^0%sc5cFX*I<jk!jP
e`%y3oPyhfvgFh<X;N<K80000<MNUMnLSTa0|8~a!

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/incontentprefs/help-glyph@2x.png b/browser/themes/shared/incontentprefs/help-glyph@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b082dd31c46643d8baebdea55dcb50e2dcdedbe8
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*0005INkl<Zc-rll
zze)o^5Qh^9DE`4tK`ep>BgCw^JxEM;FGRDqdmyNYZ{ZVI+KC|e2(~I(#>zqz8|?)x
z#ZnZp5Dn^_M)58YEpK!_*y<A4kD2}L+{I!9K@bE%5Crj$h^K|<!7Px-mDH>y^|s}B
zmt2}hUiMxr$J}$N&n#(b%+U+*ySB)iutH_flHQRo@Z$nGUeI=AWrkU)52|wYE1Aaf
zE9n0(l0sbQ-Ig17^zB>Kq`7M?r8gqmZm{Xi&y7O0m{1d6&Psxn^b{|fdPwLz+UE#1
z4Vyg9+A7=XIfTMaKuGH6Os3L}HUcf_t_6h3`o@oTw09Cz?;=<sQ$uNzOeQ=0yD1zB
zIq5E<lNm2434w9ilyGpKFtuA8CWdKfvHg~DE%Zr0V_kR-zi?;1xtE@DLaoM9sdiLt
z=FfA@<BqpAny-$a41usvBcAc{=Y&|k>Ois`ek_RWJ$f~aT5NNn=Haecfy7(R6iptr
zO;#EeoT|+O>LHX%cfD!MDe5`ADJS$&Sg7$W0cpyK$uuO}^}CFzL(3hYZaJR;+wO!H
qzOf-&^-@L>1VIo4K@bEHF<t?lDE6Y3xrmnl0000<MNUMnLSTYd;^Z;_

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/incontentprefs/preferences.css b/browser/themes/shared/incontentprefs/preferences.css
index 7148010ade1..e38a39dd0a7 100644
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -53,7 +53,9 @@ groupbox {
   margin-top: 15px;
   margin-bottom: 15px;
   -moz-margin-start: 60px;
+  -moz-margin-end: 0;
   -moz-padding-start: 0;
+  -moz-padding-end: 0;
   font-size: 1.25rem;
 }
 
@@ -182,6 +184,46 @@ button[type="menu"] > .button-box > .button-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown.png");
 }
 
+.help-button {
+  min-width: 30px;
+  border-radius: 2px;
+  border: 1px solid #C1C1C1;
+  background-color: #FFCB00;
+  background-image: none;
+  box-shadow: none;
+}
+
+.help-button:not([disabled="true"]):hover {
+  background-color: #F4C200;
+  background-image: none;
+}
+
+.help-button:not([disabled="true"]):hover:active {
+  background-color: #EABA00;
+  background-image: none;
+}
+
+.help-button > .button-box {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-right: 0 !important;
+  padding-left: 0 !important;
+}
+
+.help-button > .button-box > .button-icon {
+  width: 26px;
+  height: 26px;
+  background-image: url("chrome://browser/skin/preferences/in-content/help-glyph.png");
+  background-position: center;
+}
+
+@media (min-resolution: 2dppx) {
+  .help-button > .button-box > .button-icon {
+    background-size: 26px 26px;
+    background-image: url("chrome://browser/skin/preferences/in-content/help-glyph@2x.png");
+  }
+}
+
 .spinbuttons-button {
   -moz-margin-start: 10px !important;
   -moz-margin-end: 2px !important;
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index e3a6607e707..b7e78cf1bae 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -165,6 +165,8 @@ browser.jar:
         skin/classic/browser/preferences/in-content/icons@2x.png     (../shared/incontentprefs/icons@2x.png)
         skin/classic/browser/preferences/in-content/header.png       (../shared/incontentprefs/header.png)
         skin/classic/browser/preferences/in-content/header@2x.png    (../shared/incontentprefs/header@2x.png)
+        skin/classic/browser/preferences/in-content/help-glyph.png   (../shared/incontentprefs/help-glyph.png)
+        skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
         skin/classic/browser/preferences/in-content/sorter.png       (../shared/incontentprefs/sorter.png)
         skin/classic/browser/preferences/in-content/sorter@2x.png    (../shared/incontentprefs/sorter@2x.png)
         skin/classic/browser/preferences/in-content/dropdown.png     (../shared/incontentprefs/dropdown.png)
@@ -530,6 +532,8 @@ browser.jar:
         skin/classic/aero/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
         skin/classic/aero/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
         skin/classic/aero/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
+        skin/classic/aero/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
+        skin/classic/aero/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
         skin/classic/aero/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
         skin/classic/aero/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
         skin/classic/aero/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)

From 41a01ea2f4cc5afd3dcba5e61e9a6ece6e561262 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 7 May 2014 10:38:27 +0200
Subject: [PATCH 11/11] Backed out changeset 22347f9e52cd (bug 989890) for bc1
 testfailures

---
 .../preferences/in-content/advanced.xul       |  10 +--
 .../preferences/in-content/preferences.js     |  10 +--
 .../preferences/in-content/preferences.xul    |  61 ++++--------------
 .../browser/preferences/preferences.dtd       |   4 +-
 browser/themes/linux/jar.mn                   |   2 -
 browser/themes/osx/jar.mn                     |   2 -
 .../shared/incontentprefs/help-glyph.png      | Bin 280 -> 0 bytes
 .../shared/incontentprefs/help-glyph@2x.png   | Bin 500 -> 0 bytes
 .../shared/incontentprefs/preferences.css     |  42 ------------
 browser/themes/windows/jar.mn                 |   4 --
 10 files changed, 21 insertions(+), 114 deletions(-)
 delete mode 100644 browser/themes/shared/incontentprefs/help-glyph.png
 delete mode 100644 browser/themes/shared/incontentprefs/help-glyph@2x.png

diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/components/preferences/in-content/advanced.xul
index b242c936918..2f4d0c369ca 100644
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -138,13 +138,13 @@
         onselect="gAdvancedPane.tabSelectionChanged();">
 
   <tabs id="tabsElement">
-    <tab id="generalTab" label="&generalTab.label;"/>
+    <tab id="generalTab" label="&generalTab.label;" helpTopic="prefs-advanced-general"/>
 #ifdef MOZ_DATA_REPORTING
-    <tab id="dataChoicesTab" label="&dataChoicesTab.label;"/>
+    <tab id="dataChoicesTab" label="&dataChoicesTab.label;" helpTopic="prefs-advanced-data-choices"/>
 #endif
-    <tab id="networkTab" label="&networkTab.label;"/>
-    <tab id="updateTab" label="&updateTab.label;"/>
-    <tab id="encryptionTab" label="&certificateTab.label;"/>
+    <tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/>
+    <tab id="updateTab" label="&updateTab.label;"  helpTopic="prefs-advanced-update"/>
+    <tab id="encryptionTab" label="&certificateTab.label;" helpTopic="prefs-advanced-encryption"/>
   </tabs>
 
   <tabpanels flex="1">
diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js
index d5f74b73f9f..7630cca7a1d 100644
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -55,14 +55,6 @@ function search(aQuery, aAttribute) {
   let elements = document.getElementById("mainPrefPane").children;
   for (let element of elements) {
     let attributeValue = element.getAttribute(aAttribute);
-    element.hidden = (attributeValue && attributeValue != aQuery);
+    element.hidden = (attributeValue != aQuery);
   }
 }
-
-function helpButtonCommand() {
-  let pane = history.state;
-  let categories = document.getElementById("categories");
-  let helpTopic = categories.querySelector(".category[value=" + pane + "]")
-                            .getAttribute("helpTopic");
-  openHelpLink(helpTopic);
-}
diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index 29febabfb18..1321a41e58c 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -78,74 +78,46 @@
 
     <!-- category list -->
     <richlistbox id="categories">
-      <richlistitem id="category-general"
-                    class="category"
-                    value="paneGeneral"
-                    helpTopic="prefs-main"
-                    tooltiptext="&paneGeneral.title;"
-                    align="center">
+      <richlistitem id="category-general" class="category" align="center"
+                    value="paneGeneral" tooltiptext="&paneGeneral.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneGeneral.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-content"
-                    class="category"
-                    value="paneContent"
-                    helpTopic="prefs-content"
-                    tooltiptext="&paneContent.title;"
-                    align="center">
+      <richlistitem id="category-content" class="category" align="center"
+                    value="paneContent" tooltiptext="&paneContent.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneContent.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-application"
-                    class="category"
-                    value="paneApplications"
-                    helpTopic="prefs-applications"
-                    tooltiptext="&paneApplications.title;"
-                    align="center">
+      <richlistitem id="category-application" class="category" align="center"
+                    value="paneApplications" tooltiptext="&paneApplications.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneApplications.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-privacy"
-                    class="category"
-                    value="panePrivacy"
-                    helpTopic="prefs-privacy"
-                    tooltiptext="&panePrivacy.title;"
-                    align="center">
+      <richlistitem id="category-privacy" class="category" align="center"
+                    value="panePrivacy" tooltiptext="&panePrivacy.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&panePrivacy.title;"/>
       </richlistitem>
 
-      <richlistitem id="category-security"
-                    class="category"
-                    value="paneSecurity"
-                    helpTopic="prefs-security"
-                    tooltiptext="&paneSecurity.title;"
-                    align="center">
+      <richlistitem id="category-security" class="category" align="center"
+                    value="paneSecurity" tooltiptext="&paneSecurity.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneSecurity.title;"/>
       </richlistitem>
 
 #ifdef MOZ_SERVICES_SYNC
-      <richlistitem id="category-sync"
-                    class="category"
-                    value="paneSync"
-                    helpTopic="prefs-weave"
-                    tooltiptext="&paneSync.title;"
-                    align="center">
+      <richlistitem id="category-sync" class="category" align="center"
+                    value="paneSync" tooltiptext="&paneSync.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneSync.title;"/>
       </richlistitem>
 #endif
 
-      <richlistitem id="category-advanced"
-                    class="category"
-                    value="paneAdvanced"
-                    helpTopic="prefs-advanced-general"
-                    tooltiptext="&paneAdvanced.title;"
-                    align="center">
+      <richlistitem id="category-advanced" class="category" align="center"
+                    value="paneAdvanced" tooltiptext="&paneAdvanced.title;">
         <image class="category-icon"/>
         <label class="category-name" flex="1" value="&paneAdvanced.title;"/>
       </richlistitem>
@@ -162,11 +134,6 @@
 #ifdef MOZ_SERVICES_SYNC
 #include sync.xul
 #endif
-        <hbox pack="end">
-          <button class="help-button"
-                  aria-label="&helpButton.label;"
-                  oncommand="helpButtonCommand();"/>
-        </hbox>
       </prefpane>
     </box>
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
index 0cbb24577cd..41cfc0cf23e 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -22,6 +22,4 @@
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
 <!ENTITY  buttonForward.tooltip   "Go forward one page">
-<!ENTITY  buttonBack.tooltip      "Go back one page">
-
-<!ENTITY  helpButton.label        "Help">
+<!ENTITY  buttonBack.tooltip      "Go back one page">
\ No newline at end of file
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 002e0ec27b6..051a4976943 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -140,8 +140,6 @@ browser.jar:
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
   skin/classic/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
   skin/classic/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
-  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
   skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
   skin/classic/browser/preferences/in-content/dropdown@2x.png (../shared/incontentprefs/dropdown@2x.png)
   skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index fb55508e023..af28ee7f82f 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -230,8 +230,6 @@ browser.jar:
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
   skin/classic/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
   skin/classic/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
-  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
   skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
   skin/classic/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
   skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
diff --git a/browser/themes/shared/incontentprefs/help-glyph.png b/browser/themes/shared/incontentprefs/help-glyph.png
deleted file mode 100644
index 4943f1bb509f4a56ea2d305bca57647114777d90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F0002rNkl<Zc-muN
z7zLwXC;%p!nXI6oz+q_P-eG9#ehP?x8riyi0P=V1S~*)%)gmJsk5xu?9{+)s+yt|2
z-OqyfK>E9`v5PJ>?P4~ta`6WF49aITv~hb1vP|FFHG^hBsb}G21hnWM$Ra%(H*=cA
z6)=7ZL2(2QN;|iuH1Ua%jr(S3T>Uh%acf{;&}O5FMTWL+dm-`So<q|NWMJ*m1xnU>
zHqIV2wMfm<N!q~L)k|DYkDI0z0psWlIF77c8)<40FcEAtwDI^0%sc5cFX*I<jk!jP
e`%y3oPyhfvgFh<X;N<K80000<MNUMnLSTa0|8~a!

diff --git a/browser/themes/shared/incontentprefs/help-glyph@2x.png b/browser/themes/shared/incontentprefs/help-glyph@2x.png
deleted file mode 100644
index b082dd31c46643d8baebdea55dcb50e2dcdedbe8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*0005INkl<Zc-rll
zze)o^5Qh^9DE`4tK`ep>BgCw^JxEM;FGRDqdmyNYZ{ZVI+KC|e2(~I(#>zqz8|?)x
z#ZnZp5Dn^_M)58YEpK!_*y<A4kD2}L+{I!9K@bE%5Crj$h^K|<!7Px-mDH>y^|s}B
zmt2}hUiMxr$J}$N&n#(b%+U+*ySB)iutH_flHQRo@Z$nGUeI=AWrkU)52|wYE1Aaf
zE9n0(l0sbQ-Ig17^zB>Kq`7M?r8gqmZm{Xi&y7O0m{1d6&Psxn^b{|fdPwLz+UE#1
z4Vyg9+A7=XIfTMaKuGH6Os3L}HUcf_t_6h3`o@oTw09Cz?;=<sQ$uNzOeQ=0yD1zB
zIq5E<lNm2434w9ilyGpKFtuA8CWdKfvHg~DE%Zr0V_kR-zi?;1xtE@DLaoM9sdiLt
z=FfA@<BqpAny-$a41usvBcAc{=Y&|k>Ois`ek_RWJ$f~aT5NNn=Haecfy7(R6iptr
zO;#EeoT|+O>LHX%cfD!MDe5`ADJS$&Sg7$W0cpyK$uuO}^}CFzL(3hYZaJR;+wO!H
qzOf-&^-@L>1VIo4K@bEHF<t?lDE6Y3xrmnl0000<MNUMnLSTYd;^Z;_

diff --git a/browser/themes/shared/incontentprefs/preferences.css b/browser/themes/shared/incontentprefs/preferences.css
index e38a39dd0a7..7148010ade1 100644
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -53,9 +53,7 @@ groupbox {
   margin-top: 15px;
   margin-bottom: 15px;
   -moz-margin-start: 60px;
-  -moz-margin-end: 0;
   -moz-padding-start: 0;
-  -moz-padding-end: 0;
   font-size: 1.25rem;
 }
 
@@ -184,46 +182,6 @@ button[type="menu"] > .button-box > .button-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown.png");
 }
 
-.help-button {
-  min-width: 30px;
-  border-radius: 2px;
-  border: 1px solid #C1C1C1;
-  background-color: #FFCB00;
-  background-image: none;
-  box-shadow: none;
-}
-
-.help-button:not([disabled="true"]):hover {
-  background-color: #F4C200;
-  background-image: none;
-}
-
-.help-button:not([disabled="true"]):hover:active {
-  background-color: #EABA00;
-  background-image: none;
-}
-
-.help-button > .button-box {
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-right: 0 !important;
-  padding-left: 0 !important;
-}
-
-.help-button > .button-box > .button-icon {
-  width: 26px;
-  height: 26px;
-  background-image: url("chrome://browser/skin/preferences/in-content/help-glyph.png");
-  background-position: center;
-}
-
-@media (min-resolution: 2dppx) {
-  .help-button > .button-box > .button-icon {
-    background-size: 26px 26px;
-    background-image: url("chrome://browser/skin/preferences/in-content/help-glyph@2x.png");
-  }
-}
-
 .spinbuttons-button {
   -moz-margin-start: 10px !important;
   -moz-margin-end: 2px !important;
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index b7e78cf1bae..e3a6607e707 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -165,8 +165,6 @@ browser.jar:
         skin/classic/browser/preferences/in-content/icons@2x.png     (../shared/incontentprefs/icons@2x.png)
         skin/classic/browser/preferences/in-content/header.png       (../shared/incontentprefs/header.png)
         skin/classic/browser/preferences/in-content/header@2x.png    (../shared/incontentprefs/header@2x.png)
-        skin/classic/browser/preferences/in-content/help-glyph.png   (../shared/incontentprefs/help-glyph.png)
-        skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
         skin/classic/browser/preferences/in-content/sorter.png       (../shared/incontentprefs/sorter.png)
         skin/classic/browser/preferences/in-content/sorter@2x.png    (../shared/incontentprefs/sorter@2x.png)
         skin/classic/browser/preferences/in-content/dropdown.png     (../shared/incontentprefs/dropdown.png)
@@ -532,8 +530,6 @@ browser.jar:
         skin/classic/aero/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
         skin/classic/aero/browser/preferences/in-content/header.png      (../shared/incontentprefs/header.png)
         skin/classic/aero/browser/preferences/in-content/header@2x.png   (../shared/incontentprefs/header@2x.png)
-        skin/classic/aero/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-        skin/classic/aero/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
         skin/classic/aero/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
         skin/classic/aero/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
         skin/classic/aero/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)