From d3838e8859c7f3499e02ac0593e654b972dab7b2 Mon Sep 17 00:00:00 2001
From: Allison Naaktgeboren <ally@mozilla.com>
Date: Thu, 30 Oct 2014 12:14:37 -0700
Subject: [PATCH 01/16] Bug 1063156 - Enable e10s shims by default, even when
 browser.tabs.remote.autostart pref is false.r=billm

---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 5 +++--
 toolkit/xre/nsXREDirProvider.cpp                    | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 091c91f8cd0c..57f3ade693f9 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -4282,12 +4282,13 @@ this.XPIProvider = {
 
     let principal = Cc["@mozilla.org/systemprincipal;1"].
                     createInstance(Ci.nsIPrincipal);
-
-    if (!aMultiprocessCompatible && Services.appinfo.browserTabsRemoteAutostart) {
+#ifdef NIGHTLY_BUILD
+    if (!aMultiprocessCompatible) {
       let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"].
         getService(Ci.nsIAddonInterposition);
       Cu.setAddonInterposition(aId, interposition);
     }
+#endif
 
     if (!aFile.exists()) {
       this.bootstrapScopes[aId] =
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 9c7d539a5e37..6106d282deda 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -551,9 +551,7 @@ nsXREDirProvider::GetFiles(const char* aProperty, nsISimpleEnumerator** aResult)
 static void
 RegisterExtensionInterpositions(nsINIParser &parser)
 {
-  if (!mozilla::BrowserTabsRemoteAutostart())
-    return;
-
+#ifdef NIGHTLY_BUILD
   nsCOMPtr<nsIAddonInterposition> interposition =
     do_GetService("@mozilla.org/addons/multiprocess-shims;1");
 
@@ -572,6 +570,7 @@ RegisterExtensionInterpositions(nsINIParser &parser)
       continue;
   }
   while (true);
+#endif
 }
 
 static void

From d4bf97a6a67646dd467c4eb3b49f6d9550e7970f Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 30 Oct 2014 15:21:47 -0400
Subject: [PATCH 02/16] Bug 1067721 - [e10s] Make "Save Snapshot As" context
 menu item work for e10s. r=felipe.

--HG--
rename : browser/base/content/test/general/bug564387.html => browser/base/content/test/general/web_video.html
rename : browser/base/content/test/general/bug564387_video1.ogv => browser/base/content/test/general/web_video1.ogv
rename : browser/base/content/test/general/bug564387_video1.ogv^headers^ => browser/base/content/test/general/web_video1.ogv^headers^
extra : rebase_source : 1c2fad8158ef3803d653014d7dc1c8ce022dfc40
---
 browser/base/content/content.js               |  13 ++
 browser/base/content/nsContextMenu.js         |  20 ++-
 browser/base/content/test/general/browser.ini |   7 +-
 .../browser_autocomplete_a11y_label.js        |   1 +
 .../test/general/browser_save_video.js        |   4 +-
 .../test/general/browser_save_video_frame.js  | 126 ++++++++++++++++++
 .../base/content/test/general/bug564387.html  |  11 --
 .../general/bug564387_video1.ogv^headers^     |   3 -
 browser/base/content/test/general/head.js     |   2 +-
 .../base/content/test/general/web_video.html  |  10 ++
 .../{bug564387_video1.ogv => web_video1.ogv}  | Bin
 .../test/general/web_video1.ogv^headers^      |   3 +
 12 files changed, 173 insertions(+), 27 deletions(-)
 create mode 100644 browser/base/content/test/general/browser_save_video_frame.js
 delete mode 100644 browser/base/content/test/general/bug564387.html
 delete mode 100644 browser/base/content/test/general/bug564387_video1.ogv^headers^
 create mode 100644 browser/base/content/test/general/web_video.html
 rename browser/base/content/test/general/{bug564387_video1.ogv => web_video1.ogv} (100%)
 create mode 100644 browser/base/content/test/general/web_video1.ogv^headers^

diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index eda387e8248c..eced2433fead 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -729,3 +729,16 @@ addEventListener("pageshow", function(event) {
     });
   }
 });
+
+addMessageListener("ContextMenu:SaveVideoFrameAsImage", (message) => {
+  let video = message.objects.target;
+  let canvas = content.document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
+  canvas.width = video.videoWidth;
+  canvas.height = video.videoHeight;
+
+  let ctxDraw = canvas.getContext("2d");
+  ctxDraw.drawImage(video, 0, 0);
+  sendAsyncMessage("ContextMenu:SaveVideoFrameAsImage:Result", {
+    dataURL: canvas.toDataURL("image/jpeg", ""),
+  });
+});
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 25d237618ab1..2b66a9ac549e 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1037,6 +1037,7 @@ nsContextMenu.prototype = {
   },
 
   saveVideoFrameAsImage: function () {
+    let mm = this.browser.messageManager;
     let name = "";
     if (this.mediaURL) {
       try {
@@ -1048,13 +1049,18 @@ nsContextMenu.prototype = {
     }
     if (!name)
       name = "snapshot.jpg";
-    var video = this.target;
-    var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
-    canvas.width = video.videoWidth;
-    canvas.height = video.videoHeight;
-    var ctxDraw = canvas.getContext("2d");
-    ctxDraw.drawImage(video, 0, 0);
-    saveImageURL(canvas.toDataURL("image/jpeg", ""), name, "SaveImageTitle", true, false, document.documentURIObject, this.target.ownerDocument);
+
+    mm.sendAsyncMessage("ContextMenu:SaveVideoFrameAsImage", {}, {
+      target: this.target,
+    });
+
+    let onMessage = (message) => {
+      mm.removeMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
+      let dataURL = message.data.dataURL;
+      saveImageURL(dataURL, name, "SaveImageTitle", true, false,
+                   document.documentURIObject, this.target.ownerDocument);
+    };
+    mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
   },
 
   fullScreenVideo: function () {
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 74a2c1ed32cd..7afd169ca76d 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -16,9 +16,6 @@ support-files =
   browser_star_hsts.sjs
   browser_tab_dragdrop2_frame1.xul
   browser_web_channel.html
-  bug564387.html
-  bug564387_video1.ogv
-  bug564387_video1.ogv^headers^
   bug592338.html
   bug792517-2.html
   bug792517.html
@@ -82,6 +79,9 @@ support-files =
   test_wyciwyg_copying.html
   title_test.svg
   video.ogg
+  web_video.html
+  web_video1.ogv
+  web_video1.ogv^headers^
   zoom_test.html
   test_no_mcb_on_http_site_img.html
   test_no_mcb_on_http_site_img.css
@@ -411,6 +411,7 @@ skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates c
 skip-if = buildapp == 'mulet' || e10s # e10s: Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
 skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (event.target)
+[browser_save_video_frame.js]
 [browser_scope.js]
 [browser_searchSuggestionUI.js]
 skip-if = e10s
diff --git a/browser/base/content/test/general/browser_autocomplete_a11y_label.js b/browser/base/content/test/general/browser_autocomplete_a11y_label.js
index d806e0deea71..df30a26c77ea 100644
--- a/browser/base/content/test/general/browser_autocomplete_a11y_label.js
+++ b/browser/base/content/test/general/browser_autocomplete_a11y_label.js
@@ -24,6 +24,7 @@ add_task(function*() {
   let actionURL = makeActionURI("switchtab", {url: "about:about"}).spec;
   yield check_a11y_label("% about", "about:about " + actionURL + " Tab");
 
+  gURLBar.popup.hidePopup();
   yield promisePopupHidden(gURLBar.popup);
   gBrowser.removeTab(tab);
 });
diff --git a/browser/base/content/test/general/browser_save_video.js b/browser/base/content/test/general/browser_save_video.js
index 6361ec468ba1..758edf8c4c75 100644
--- a/browser/base/content/test/general/browser_save_video.js
+++ b/browser/base/content/test/general/browser_save_video.js
@@ -12,7 +12,7 @@ function test() {
   waitForExplicitFinish();
   var fileName;
 
-  gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/bug564387.html");
+  gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html");
 
   gBrowser.addEventListener("pageshow", function pageShown(event) {
     if (event.target.location == "about:blank")
@@ -66,7 +66,7 @@ function test() {
   function onTransferComplete(downloadSuccess) {
     ok(downloadSuccess, "Video file should have been downloaded successfully");
 
-    is(fileName, "Bug564387-expectedName.ogv",
+    is(fileName, "web-video1-expectedName.ogv",
        "Video file name is correctly retrieved from Content-Disposition http header");
 
     finish();
diff --git a/browser/base/content/test/general/browser_save_video_frame.js b/browser/base/content/test/general/browser_save_video_frame.js
new file mode 100644
index 000000000000..0b0469300ac2
--- /dev/null
+++ b/browser/base/content/test/general/browser_save_video_frame.js
@@ -0,0 +1,126 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const VIDEO_URL = "http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html";
+
+/**
+ * mockTransfer.js provides a utility that lets us mock out
+ * the "Save File" dialog.
+ */
+Cc["@mozilla.org/moz/jssubscript-loader;1"]
+  .getService(Ci.mozIJSSubScriptLoader)
+  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+                 this);
+
+/**
+ * Creates and returns an nsIFile for a new temporary save
+ * directory.
+ *
+ * @return nsIFile
+ */
+function createTemporarySaveDirectory() {
+  let saveDir = Cc["@mozilla.org/file/directory_service;1"]
+                  .getService(Ci.nsIProperties)
+                  .get("TmpD", Ci.nsIFile);
+  saveDir.append("testsavedir");
+  if (!saveDir.exists())
+    saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
+  return saveDir;
+}
+/**
+ * MockTransfer exposes a "mockTransferCallback" global which
+ * allows us to define a callback to be called once the mock file
+ * selector has selected where to save the file.
+ */
+function waitForTransferComplete() {
+  return new Promise((resolve) => {
+    mockTransferCallback = () => {
+      ok(true, "Transfer completed");
+      resolve();
+    }
+  });
+}
+
+/**
+ * Given some browser, loads a framescript that right-clicks
+ * on the video1 element to spawn a contextmenu.
+ */
+function rightClickVideo(browser) {
+  let frame_script = () => {
+    const Ci = Components.interfaces;
+    let utils = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIDOMWindowUtils);
+
+    let document = content.document;
+    let video = document.getElementById("video1");
+    let rect = video.getBoundingClientRect();
+
+    /* Synthesize a click in the center of the video. */
+    let left = rect.left + (rect.width / 2);
+    let top = rect.top + (rect.height / 2);
+
+    utils.sendMouseEvent("contextmenu", left, top,
+                         2, /* aButton */
+                         1, /* aClickCount */
+                         0  /* aModifiers */);
+  };
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", true);
+}
+
+/**
+ * Loads a page with a <video> element, right-clicks it and chooses
+ * to save a frame screenshot to the disk. Completes once we've
+ * verified that the frame has been saved to disk.
+ */
+add_task(function*() {
+  let MockFilePicker = SpecialPowers.MockFilePicker;
+  MockFilePicker.init(window);
+
+  // Create the folder the video will be saved into.
+  let destDir = createTemporarySaveDirectory();
+  let destFile = destDir.clone();
+
+  MockFilePicker.displayDirectory = destDir;
+  MockFilePicker.showCallback = function(fp) {
+    destFile.append(fp.defaultString);
+    MockFilePicker.returnFiles = [destFile];
+    MockFilePicker.filterIndex = 1; // kSaveAsType_URL
+  };
+
+  mockTransferRegisterer.register();
+
+  // Make sure that we clean these things up when we're done.
+  registerCleanupFunction(function () {
+    mockTransferRegisterer.unregister();
+    MockFilePicker.cleanup();
+    destDir.remove(true);
+  });
+
+  let tab = gBrowser.addTab();
+  gBrowser.selectedTab = tab;
+  let browser = tab.linkedBrowser;
+  info("Loading video tab");
+  yield promiseTabLoadEvent(tab, VIDEO_URL);
+  info("Video tab loaded.");
+
+  let video = browser.contentDocument.getElementById("video1");
+  let context = document.getElementById("contentAreaContextMenu");
+  let popupPromise = promisePopupShown(context);
+
+  info("Synthesizing right-click on video element");
+  rightClickVideo(browser);
+  info("Waiting for popup to fire popupshown.");
+  yield popupPromise;
+  info("Popup fired popupshown");
+
+  let saveSnapshotCommand = document.getElementById("context-video-saveimage");
+  let promiseTransfer = waitForTransferComplete()
+  info("Firing save snapshot command");
+  saveSnapshotCommand.doCommand();
+  context.hidePopup();
+  info("Waiting for transfer completion");
+  yield promiseTransfer;
+  info("Transfer complete");
+  gBrowser.removeTab(tab);
+});
diff --git a/browser/base/content/test/general/bug564387.html b/browser/base/content/test/general/bug564387.html
deleted file mode 100644
index 51ba4d04bee6..000000000000
--- a/browser/base/content/test/general/bug564387.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-  <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=564387 -->
-  <head>
-    <title> Bug 564387 test</title>
-  </head>
-  <body>
-    Testing for Mozilla Bug: 564387
-    <br>
-    <video src="bug564387_video1.ogv" id="video1"> </video> 
-  </body>
-</html>
diff --git a/browser/base/content/test/general/bug564387_video1.ogv^headers^ b/browser/base/content/test/general/bug564387_video1.ogv^headers^
deleted file mode 100644
index f880d0ac3a57..000000000000
--- a/browser/base/content/test/general/bug564387_video1.ogv^headers^
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Disposition: filename="Bug564387-expectedName.ogv" 
-Content-Type: video/ogg
-
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index a8b2380f22c2..559b2cd8b47d 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -744,7 +744,7 @@ function is_element_hidden(element, msg) {
 function promisePopupEvent(popup, eventSuffix) {
   let endState = {shown: "open", hidden: "closed"}[eventSuffix];
 
-  if (popup.state = endState)
+  if (popup.state == endState)
     return Promise.resolve();
 
   let eventType = "popup" + eventSuffix;
diff --git a/browser/base/content/test/general/web_video.html b/browser/base/content/test/general/web_video.html
new file mode 100644
index 000000000000..467fb0ce1cb5
--- /dev/null
+++ b/browser/base/content/test/general/web_video.html
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <title>Document with Web Video</title>
+  </head>
+  <body>
+    This document has some web video in it.
+    <br>
+    <video src="web_video1.ogv" id="video1"> </video>
+  </body>
+</html>
diff --git a/browser/base/content/test/general/bug564387_video1.ogv b/browser/base/content/test/general/web_video1.ogv
similarity index 100%
rename from browser/base/content/test/general/bug564387_video1.ogv
rename to browser/base/content/test/general/web_video1.ogv
diff --git a/browser/base/content/test/general/web_video1.ogv^headers^ b/browser/base/content/test/general/web_video1.ogv^headers^
new file mode 100644
index 000000000000..4511e9255258
--- /dev/null
+++ b/browser/base/content/test/general/web_video1.ogv^headers^
@@ -0,0 +1,3 @@
+Content-Disposition: filename="web-video1-expectedName.ogv" 
+Content-Type: video/ogg
+

From ba13573806681bb4235be3173696aa94e2d1e176 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Thu, 30 Oct 2014 13:25:35 -0700
Subject: [PATCH 03/16] Backed out changeset fe00dbf89462 (bug 1063156) for
 bustage

---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 5 ++---
 toolkit/xre/nsXREDirProvider.cpp                    | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 57f3ade693f9..091c91f8cd0c 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -4282,13 +4282,12 @@ this.XPIProvider = {
 
     let principal = Cc["@mozilla.org/systemprincipal;1"].
                     createInstance(Ci.nsIPrincipal);
-#ifdef NIGHTLY_BUILD
-    if (!aMultiprocessCompatible) {
+
+    if (!aMultiprocessCompatible && Services.appinfo.browserTabsRemoteAutostart) {
       let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"].
         getService(Ci.nsIAddonInterposition);
       Cu.setAddonInterposition(aId, interposition);
     }
-#endif
 
     if (!aFile.exists()) {
       this.bootstrapScopes[aId] =
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 6106d282deda..9c7d539a5e37 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -551,7 +551,9 @@ nsXREDirProvider::GetFiles(const char* aProperty, nsISimpleEnumerator** aResult)
 static void
 RegisterExtensionInterpositions(nsINIParser &parser)
 {
-#ifdef NIGHTLY_BUILD
+  if (!mozilla::BrowserTabsRemoteAutostart())
+    return;
+
   nsCOMPtr<nsIAddonInterposition> interposition =
     do_GetService("@mozilla.org/addons/multiprocess-shims;1");
 
@@ -570,7 +572,6 @@ RegisterExtensionInterpositions(nsINIParser &parser)
       continue;
   }
   while (true);
-#endif
 }
 
 static void

From 9a8d9b719764a868f93cca23dfc43c82253a4d10 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Thu, 30 Oct 2014 14:15:49 -0700
Subject: [PATCH 04/16] Bug 1089810 - Update Private Browsing contextual hint
 string. r=margaret

---
 mobile/android/base/home/HistoryPanel.java            | 1 -
 mobile/android/base/locales/en-US/android_strings.dtd | 4 ++--
 mobile/android/base/strings.xml.in                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/home/HistoryPanel.java b/mobile/android/base/home/HistoryPanel.java
index cb9234b3fb8b..4d5d6d954fa9 100644
--- a/mobile/android/base/home/HistoryPanel.java
+++ b/mobile/android/base/home/HistoryPanel.java
@@ -229,7 +229,6 @@ public class HistoryPanel extends HomeFragment {
 
             final SpannableStringBuilder hintBuilder = formatHintText(hintText);
             if (hintBuilder != null) {
-                emptyHint.setText(hintBuilder);
                 emptyHint.setText(hintBuilder);
                 emptyHint.setMovementMethod(LinkMovementMethod.getInstance());
                 emptyHint.setVisibility(View.VISIBLE);
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 0690c422e492..7e3fca94e99d 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -400,9 +400,9 @@ size. -->
 <!ENTITY home_last_tabs_empty "Your recent tabs show up here.">
 <!ENTITY home_open_all "Open all">
 <!ENTITY home_most_recent_empty "Websites you visited most recently show up here.">
-<!-- Localization note (home_most_recent_emptyhint): "Psst" is a sound that might be used to attract someone's attention unobtrusively, and intended to hint at "Private browsing" to the user.
+<!-- Localization note (home_most_recent_emptyhint2): "Psst" is a sound that might be used to attract someone's attention unobtrusively, and intended to hint at Private Browsing to the user.
      The placeholders &formatS1; and &formatS2; are used to mark the location of text underlining. -->
-<!ENTITY home_most_recent_emptyhint "Psst: &formatS1;Private browsing&formatS2; mode won\'t save your history.">
+<!ENTITY home_most_recent_emptyhint2 "Psst: using a &formatS1;New Private Tab&formatS2; won\'t save your history.">
 <!ENTITY home_reading_list_empty "Articles you save for later show up here.">
 <!-- Localization note (home_reading_list_hint): The "TIP" string is synonymous to "hint", "clue", etc. This string is displayed
      as an advisory message on how to add content to the reading list when the reading list empty.
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 96b8219c0651..771d0227fe76 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -355,7 +355,7 @@
   <string name="home_last_tabs_empty">&home_last_tabs_empty;</string>
   <string name="home_open_all">&home_open_all;</string>
   <string name="home_most_recent_empty">&home_most_recent_empty;</string>
-  <string name="home_most_recent_emptyhint">&home_most_recent_emptyhint;</string>
+  <string name="home_most_recent_emptyhint">&home_most_recent_emptyhint2;</string>
   <string name="home_reading_list_empty">&home_reading_list_empty;</string>
   <string name="home_reading_list_hint">&home_reading_list_hint2;</string>
   <string name="home_reading_list_hint_accessible">&home_reading_list_hint_accessible;</string>

From b51ceaf6d703aebae430b7eceaa72b755fdaf293 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 30 Oct 2014 15:52:18 -0700
Subject: [PATCH 05/16] Bug 1053434 - Listen for lightweight theme changes and
 call relevant listeners for devedition theme;r=Gijs

---
 browser/base/content/browser-devedition.js    | 32 +++++++++++---
 .../test/general/browser_devedition.js        | 44 +++++++++++++++++++
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/browser-devedition.js b/browser/base/content/browser-devedition.js
index 98b7285cb397..cec20f59f1d7 100644
--- a/browser/base/content/browser-devedition.js
+++ b/browser/base/content/browser-devedition.js
@@ -14,10 +14,11 @@ let DevEdition = {
 
   styleSheetLocation: "chrome://browser/skin/devedition.css",
   styleSheet: null,
+  defaultThemeID: "{972ce4c6-7e08-4474-a285-3208198ce6fd}",
 
   init: function () {
     this._updateDevtoolsThemeAttribute();
-    this._updateStyleSheet();
+    this._updateStyleSheetFromPrefs();
 
     // Listen for changes to all prefs except for complete themes.
     // No need for this since changing a complete theme requires a
@@ -25,14 +26,27 @@ let DevEdition = {
     Services.prefs.addObserver(this._lwThemePrefName, this, false);
     Services.prefs.addObserver(this._prefName, this, false);
     Services.prefs.addObserver(this._devtoolsThemePrefName, this, false);
+    Services.obs.addObserver(this, "lightweight-theme-styling-update", false);
   },
 
   observe: function (subject, topic, data) {
+    if (topic == "lightweight-theme-styling-update") {
+      let newTheme = JSON.parse(data);
+      if (!newTheme || newTheme.id === this.defaultThemeID) {
+        // A lightweight theme has been unapplied, so just re-read prefs.
+        this._updateStyleSheetFromPrefs();
+      } else {
+        // A lightweight theme has been applied, but the pref may not be
+        // set yet if this happened from customize menu or addons page.
+        this._toggleStyleSheet(false);
+      }
+    }
+
     if (topic == "nsPref:changed") {
       if (data == this._devtoolsThemePrefName) {
         this._updateDevtoolsThemeAttribute();
       } else {
-        this._updateStyleSheet();
+        this._updateStyleSheetFromPrefs();
       }
     }
   },
@@ -42,11 +56,12 @@ let DevEdition = {
     // to change colors based on the selected devtools theme.
     document.documentElement.setAttribute("devtoolstheme",
       Services.prefs.getCharPref(this._devtoolsThemePrefName));
+    if (this.styleSheet) {
+      ToolbarIconColor.inferFromText();
+    }
   },
 
-  _updateStyleSheet: function() {
-    // Only try to apply the dev edition theme if it is preffered
-    // on and there are no other themes applied.
+  _updateStyleSheetFromPrefs: function() {
     let lightweightThemeSelected = false;
     try {
       lightweightThemeSelected = Services.prefs.getBoolPref(this._lwThemePrefName);
@@ -60,18 +75,24 @@ let DevEdition = {
     let deveditionThemeEnabled = Services.prefs.getBoolPref(this._prefName) &&
       !lightweightThemeSelected && defaultThemeSelected;
 
+    this._toggleStyleSheet(deveditionThemeEnabled);
+  },
+
+  _toggleStyleSheet: function(deveditionThemeEnabled) {
     if (deveditionThemeEnabled && !this.styleSheet) {
       let styleSheetAttr = `href="${this.styleSheetLocation}" type="text/css"`;
       let styleSheet = this.styleSheet = document.createProcessingInstruction(
         'xml-stylesheet', styleSheetAttr);
       this.styleSheet.addEventListener("load", function onLoad() {
         styleSheet.removeEventListener("load", onLoad);
+        gBrowser.tabContainer._positionPinnedTabs();
         ToolbarIconColor.inferFromText();
       });
       document.insertBefore(this.styleSheet, document.documentElement);
     } else if (!deveditionThemeEnabled && this.styleSheet) {
       this.styleSheet.remove();
       this.styleSheet = null;
+      gBrowser.tabContainer._positionPinnedTabs();
       ToolbarIconColor.inferFromText();
     }
   },
@@ -80,6 +101,7 @@ let DevEdition = {
     Services.prefs.removeObserver(this._lwThemePrefName, this);
     Services.prefs.removeObserver(this._prefName, this);
     Services.prefs.removeObserver(this._devtoolsThemePrefName, this);
+    Services.obs.removeObserver(this, "lightweight-theme-styling-update", false);
     this.styleSheet = null;
   }
 };
diff --git a/browser/base/content/test/general/browser_devedition.js b/browser/base/content/test/general/browser_devedition.js
index 8982f4e48459..5a3b95bf8de3 100644
--- a/browser/base/content/test/general/browser_devedition.js
+++ b/browser/base/content/test/general/browser_devedition.js
@@ -65,5 +65,49 @@ function startTests() {
   is (document.documentElement.getAttribute("devtoolstheme"), "light",
     "The documentElement has an attribute based on devtools theme.");
 
+  testLightweightThemePreview();
   finish();
 }
+
+function dummyLightweightTheme(id) {
+  return {
+    id: id,
+    name: id,
+    headerURL: "http://lwttest.invalid/a.png",
+    footerURL: "http://lwttest.invalid/b.png",
+    textcolor: "red",
+    accentcolor: "blue"
+  };
+}
+
+function testLightweightThemePreview() {
+  let {LightweightThemeManager} = Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
+
+  info ("Turning the pref on, then previewing lightweight themes");
+  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
+  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
+  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview0"));
+  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a lightweight theme preview.");
+  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview1"));
+  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a second lightweight theme preview.");
+  LightweightThemeManager.resetPreview();
+  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled again after resetting the preview.");
+
+  info ("Turning the pref on, then previewing a theme, turning it off and resetting the preview");
+  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
+  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
+  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview2"));
+  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a lightweight theme preview.");
+  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, false);
+  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after pref is turned off.");
+  LightweightThemeManager.resetPreview();
+  ok (!DevEdition.styleSheet, "The devedition stylesheet is still disabled after resetting the preview.");
+
+  info ("Turning the pref on, then previewing the default theme, turning it off and resetting the preview");
+  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
+  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
+  LightweightThemeManager.previewTheme(dummyLightweightTheme("{972ce4c6-7e08-4474-a285-3208198ce6fd}"));
+  ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied.");
+  LightweightThemeManager.resetPreview();
+  ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview.");
+}

From 536f406826701319e7f5e18b0008ec582e5e6872 Mon Sep 17 00:00:00 2001
From: Swaroop Rao <swaroop.rao@gmail.com>
Date: Thu, 30 Oct 2014 16:31:25 -0700
Subject: [PATCH 06/16] Bug 1002888 - Allow deleting Firefox Account from
 confirm account screen. r=nalexander

--HG--
extra : rebase_source : 16736f77434d01d37ecd36180064a5a53b1d9179
---
 .../FxAccountConfirmAccountActivity.java      | 13 ++++++++++++-
 .../activities/FxAccountStatusActivity.java   | 19 +++++++++++--------
 .../base/locales/en-US/sync_strings.dtd       |  1 +
 .../layout/fxaccount_confirm_account.xml      |  5 +++++
 mobile/android/services/strings.xml.in        |  1 +
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java b/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java
index a541f6c1e0ef..aff1b04e8cf5 100644
--- a/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java
@@ -7,6 +7,7 @@ package org.mozilla.gecko.fxa.activities;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
+import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 import org.mozilla.gecko.fxa.login.Engaged;
 import org.mozilla.gecko.fxa.login.State;
@@ -18,6 +19,7 @@ import org.mozilla.gecko.sync.setup.activities.ActivityUtils;
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -33,6 +35,7 @@ public class FxAccountConfirmAccountActivity extends FxAccountAbstractActivity i
   // Set in onCreate.
   protected TextView verificationLinkTextView;
   protected View resendLink;
+  protected View changeEmail;
 
   // Set in onResume.
   protected AndroidFxAccount fxAccount;
@@ -56,6 +59,8 @@ public class FxAccountConfirmAccountActivity extends FxAccountAbstractActivity i
     verificationLinkTextView = (TextView) ensureFindViewById(null, R.id.verification_link_text, "verification link text");
     resendLink = ensureFindViewById(null, R.id.resend_confirmation_email_link, "resend confirmation email link");
     resendLink.setOnClickListener(this);
+    changeEmail = ensureFindViewById(null, R.id.change_confirmation_email_link, "change confirmation email address");
+    changeEmail.setOnClickListener(this);
 
     View backToBrowsingButton = ensureFindViewById(null, R.id.button, "back to browsing button");
     backToBrowsingButton.setOnClickListener(new OnClickListener() {
@@ -159,6 +164,12 @@ public class FxAccountConfirmAccountActivity extends FxAccountAbstractActivity i
 
   @Override
   public void onClick(View v) {
-    FxAccountCodeResender.resendCode(this, fxAccount);
+    if (v.equals(resendLink)) {
+        FxAccountCodeResender.resendCode(this, fxAccount);
+    } else if (v.equals(changeEmail)) {
+      final Account account = fxAccount.getAndroidAccount();
+      Intent intent = new Intent(this, FxAccountGetStartedActivity.class);
+      FxAccountStatusActivity.maybeDeleteAndroidAccount(this, account, intent);
+    }
   }
 }
diff --git a/mobile/android/base/fxa/activities/FxAccountStatusActivity.java b/mobile/android/base/fxa/activities/FxAccountStatusActivity.java
index ca672a1d7570..fef1a40249d4 100644
--- a/mobile/android/base/fxa/activities/FxAccountStatusActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountStatusActivity.java
@@ -10,6 +10,7 @@ import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 import org.mozilla.gecko.sync.Utils;
+import org.mozilla.gecko.LocaleAware.LocaleAwareActivity;
 import org.mozilla.gecko.LocaleAware.LocaleAwareFragmentActivity;
 
 import android.accounts.Account;
@@ -113,7 +114,7 @@ public class FxAccountStatusActivity extends LocaleAwareFragmentActivity {
    * Helper function to maybe remove the given Android account.
    */
   @SuppressLint("InlinedApi")
-  public void maybeDeleteAndroidAccount(final Account account) {
+  public static void maybeDeleteAndroidAccount(final Activity activity, final Account account, final Intent intent) {
     if (account == null) {
       Logger.warn(LOG_TAG, "Trying to delete null account; ignoring request.");
       return;
@@ -123,11 +124,13 @@ public class FxAccountStatusActivity extends LocaleAwareFragmentActivity {
       @Override
       public void run(AccountManagerFuture<Boolean> future) {
         Logger.info(LOG_TAG, "Account " + Utils.obfuscateEmail(account.name) + " removed.");
-        final Activity activity = FxAccountStatusActivity.this;
         final String text = activity.getResources().getString(R.string.fxaccount_remove_account_toast, account.name);
         Toast.makeText(activity, text, Toast.LENGTH_LONG).show();
-
-        finish();
+        if (intent != null) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            activity.startActivity(intent);
+        }
+        activity.finish();
       }
     };
 
@@ -138,20 +141,20 @@ public class FxAccountStatusActivity extends LocaleAwareFragmentActivity {
     final int icon;
     if (AppConstants.Versions.feature11Plus) {
       final TypedValue typedValue = new TypedValue();
-      getTheme().resolveAttribute(android.R.attr.alertDialogIcon, typedValue, true);
+      activity.getTheme().resolveAttribute(android.R.attr.alertDialogIcon, typedValue, true);
       icon = typedValue.resourceId;
     } else {
       icon = android.R.drawable.ic_dialog_alert;
     }
 
-    final AlertDialog dialog = new AlertDialog.Builder(this)
+    final AlertDialog dialog = new AlertDialog.Builder(activity)
       .setTitle(R.string.fxaccount_remove_account_dialog_title)
       .setIcon(icon)
       .setMessage(R.string.fxaccount_remove_account_dialog_message)
       .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
         @Override
         public void onClick(DialogInterface dialog, int which) {
-          AccountManager.get(FxAccountStatusActivity.this).removeAccount(account, callback, null);
+          AccountManager.get(activity).removeAccount(account, callback, null);
         }
       })
       .setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener() {
@@ -174,7 +177,7 @@ public class FxAccountStatusActivity extends LocaleAwareFragmentActivity {
     }
 
     if (itemId == R.id.remove_account) {
-      maybeDeleteAndroidAccount(FirefoxAccounts.getFirefoxAccount(this));
+      maybeDeleteAndroidAccount(this, FirefoxAccounts.getFirefoxAccount(this), null);
       return true;
     }
 
diff --git a/mobile/android/base/locales/en-US/sync_strings.dtd b/mobile/android/base/locales/en-US/sync_strings.dtd
index a58be7c5c84e..9ef4d9b9c4e6 100644
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -167,6 +167,7 @@
 <!-- Localization note: &formatS; is the Firefox Account's email address. -->
 <!ENTITY fxaccount_confirm_account_verification_link 'A verification link has been sent to &formatS;'>
 <!ENTITY fxaccount_confirm_account_resend_email 'Resend email'>
+<!ENTITY fxaccount_confirm_account_change_email 'Forget this email address?'>
 <!ENTITY fxaccount_confirm_account_verification_link_sent2 'Verification email sent'>
 <!ENTITY fxaccount_confirm_account_verification_link_not_sent2 'Couldn\&apos;t send verification email'>
 
diff --git a/mobile/android/base/resources/layout/fxaccount_confirm_account.xml b/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
index daf10a90b208..96d460e95e87 100644
--- a/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
+++ b/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
@@ -45,6 +45,11 @@
             style="@style/FxAccountLinkItem"
             android:text="@string/fxaccount_confirm_account_resend_email" />
 
+       	<TextView
+            android:id="@+id/change_confirmation_email_link"
+            style="@style/FxAccountLinkItem"
+            android:text="@string/fxaccount_confirm_account_change_email" />
+
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
diff --git a/mobile/android/services/strings.xml.in b/mobile/android/services/strings.xml.in
index afe9ff058964..d9a10c3ac4eb 100644
--- a/mobile/android/services/strings.xml.in
+++ b/mobile/android/services/strings.xml.in
@@ -154,6 +154,7 @@
 <string name="fxaccount_confirm_account_header">&fxaccount_confirm_account_header;</string>
 <string name="fxaccount_confirm_account_verification_link">&fxaccount_confirm_account_verification_link;</string>
 <string name="fxaccount_confirm_account_resend_email">&fxaccount_confirm_account_resend_email;</string>
+<string name="fxaccount_confirm_account_change_email">&fxaccount_confirm_account_change_email;</string>
 <string name="fxaccount_confirm_account_verification_link_sent">&fxaccount_confirm_account_verification_link_sent2;</string>
 <string name="fxaccount_confirm_account_verification_link_not_sent">&fxaccount_confirm_account_verification_link_not_sent2;</string>
 

From 0da1c82db73c5ab4426ecf794824d5bc4fde8487 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Oct 2014 17:02:33 -0700
Subject: [PATCH 07/16] Bug 1090599 - Upgrade in-tree jsmin to release-2.0.11.
 r=gps

This updates to release-2.0.11 (sha1: 04374472ed18) from
https://bitbucket.org/dcs/jsmin/.
---
 python/jsmin/jsmin/__init__.py |  52 ++++++++++++++--
 python/jsmin/jsmin/test.py     | 107 ++++++++++++++++++++++++++++++++-
 2 files changed, 152 insertions(+), 7 deletions(-)

diff --git a/python/jsmin/jsmin/__init__.py b/python/jsmin/jsmin/__init__.py
index e7cdce625b1d..31949ff1cdf5 100644
--- a/python/jsmin/jsmin/__init__.py
+++ b/python/jsmin/jsmin/__init__.py
@@ -37,7 +37,7 @@ else:
 
 
 __all__ = ['jsmin', 'JavascriptMinify']
-__version__ = '2.0.3'
+__version__ = '2.0.11'
 
 
 def jsmin(js):
@@ -72,7 +72,20 @@ class JavascriptMinify(object):
     def minify(self, instream=None, outstream=None):
         if instream and outstream:
             self.ins, self.outs = instream, outstream
-        write = self.outs.write
+
+        self.is_return = False
+        self.return_buf = ''
+
+        def write(char):
+            # all of this is to support literal regular expressions.
+            # sigh
+            if char in 'return':
+                self.return_buf += char
+                self.is_return = self.return_buf == 'return'
+            self.outs.write(char)
+            if self.is_return:
+                self.return_buf = ''
+
         read = self.ins.read
 
         space_strings = "abcdefghijklmnopqrstuvwxyz"\
@@ -82,6 +95,7 @@ class JavascriptMinify(object):
         newlineend_strings = enders + space_strings
         do_newline = False
         do_space = False
+        escape_slash_count = 0
         doing_single_comment = False
         previous_before_comment = ''
         doing_multi_comment = False
@@ -90,13 +104,18 @@ class JavascriptMinify(object):
         quote_buf = []
 
         previous = read(1)
+        if previous == '\\':
+            escape_slash_count += 1
         next1 = read(1)
         if previous == '/':
             if next1 == '/':
                 doing_single_comment = True
             elif next1 == '*':
                 doing_multi_comment = True
+                previous = next1
+                next1 = read(1)
             else:
+                in_re = True  # literal regex at start of script
                 write(previous)
         elif not previous:
             return
@@ -111,16 +130,20 @@ class JavascriptMinify(object):
             return
 
         while 1:
-            next2 = read(1)  
+            next2 = read(1)
             if not next2:
                 last = next1.strip()
                 if not (doing_single_comment or doing_multi_comment)\
                     and last not in ('', '/'):
+                    if in_quote:
+                        write(''.join(quote_buf))
                     write(last)
                 break
             if doing_multi_comment:
                 if next1 == '*' and next2 == '/':
                     doing_multi_comment = False
+                    if previous_before_comment and previous_before_comment in space_strings:
+                        do_space = True
                     next2 = read(1)
             elif doing_single_comment:
                 if next1 in '\r\n':
@@ -164,9 +187,17 @@ class JavascriptMinify(object):
                     or previous_non_space > '~') \
                     and (next2 in space_strings or next2 > '~'):
                     do_space = True
+                elif previous_non_space in '-+' and next2 == previous_non_space:
+                    # protect against + ++ or - -- sequences
+                    do_space = True
+                elif self.is_return and next2 == '/':
+                    # returning a regex...
+                    write(' ')
             elif next1 == '/':
+                if do_space:
+                    write(' ')
                 if in_re:
-                    if previous != '\\':
+                    if previous != '\\' or (not escape_slash_count % 2) or next2 in 'gimy':
                         in_re = False
                     write('/')
                 elif next2 == '/':
@@ -174,8 +205,12 @@ class JavascriptMinify(object):
                     previous_before_comment = previous_non_space
                 elif next2 == '*':
                     doing_multi_comment = True
+                    previous_before_comment = previous_non_space
+                    previous = next1
+                    next1 = next2
+                    next2 = read(1)
                 else:
-                    in_re = previous_non_space in '(,=:[?!&|'
+                    in_re = previous_non_space in '(,=:[?!&|;' or self.is_return  # literal regular expression
                     write('/')
             else:
                 if do_space:
@@ -184,12 +219,19 @@ class JavascriptMinify(object):
                 if do_newline:
                     write('\n')
                     do_newline = False
+
                 write(next1)
                 if not in_re and next1 in "'\"":
                     in_quote = next1
                     quote_buf = []
+
             previous = next1
             next1 = next2
 
             if previous >= '!':
                 previous_non_space = previous
+
+            if previous == '\\':
+                escape_slash_count += 1
+            else:
+                escape_slash_count = 0
diff --git a/python/jsmin/jsmin/test.py b/python/jsmin/jsmin/test.py
index 19dd01a00ed3..f1fc54cf5d55 100644
--- a/python/jsmin/jsmin/test.py
+++ b/python/jsmin/jsmin/test.py
@@ -94,10 +94,37 @@ another thing;"""
         """
         expected = r"""function foo(){alert('crud');}"""
         self.assertMinified(js, expected)
-        
+
+    def testBlockCommentStartingWithSlash(self):
+        self.assertMinified('A; /*/ comment */ B', 'A;B')
+
+    def testBlockCommentEndingWithSlash(self):
+        self.assertMinified('A; /* comment /*/ B', 'A;B')
+
+    def testLeadingBlockCommentStartingWithSlash(self):
+        self.assertMinified('/*/ comment */ A', 'A')
+
+    def testLeadingBlockCommentEndingWithSlash(self):
+        self.assertMinified('/* comment /*/ A', 'A')
+
+    def testEmptyBlockComment(self):
+        self.assertMinified('/**/ A', 'A')
+
+    def testBlockCommentMultipleOpen(self):
+        self.assertMinified('/* A /* B */ C', 'C')
+
     def testJustAComment(self):
         self.assertMinified('     // a comment', '')
-        
+
+    def test_issue_10(self):
+        js = '''
+        files = [{name: value.replace(/^.*\\\\/, '')}];
+        // comment
+        A
+        '''
+        expected = '''files=[{name:value.replace(/^.*\\\\/,'')}]; A'''
+        self.assertMinified(js, expected)
+
     def testRe(self):
         js = r'''  
         var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
@@ -153,6 +180,20 @@ Element.cleanWhitespace(element);"""
         expected = r"""inspect:function(useDoubleQuotes){var escapedString=this.gsub(/[\x00-\x1f\\]/,function(match){var character=String.specialChar[match[0]];return character?character:'\\u00'+match[0].charCodeAt().toPaddedString(2,16);});if(useDoubleQuotes)return'"'+escapedString.replace(/"/g,'\\"')+'"';return"'"+escapedString.replace(/'/g,'\\\'')+"'";},toJSON:function(){return this.inspect(true);},unfilterJSON:function(filter){return this.sub(filter||Prototype.JSONFilter,'#{1}');},"""
         self.assertMinified(js, expected)
 
+    def testLiteralRe(self):
+        js = r"""
+        myString.replace(/\\/g, '/');
+        console.log("hi");
+        """
+        expected = r"""myString.replace(/\\/g,'/');console.log("hi");"""
+        self.assertMinified(js, expected)
+
+        js = r''' return /^data:image\//i.test(url) ||
+        /^(https?|ftp|file|about|chrome|resource):/.test(url);
+        '''
+        expected = r'''return /^data:image\//i.test(url)||/^(https?|ftp|file|about|chrome|resource):/.test(url);'''
+        self.assertMinified(js, expected)
+
     def testNoBracesWithComment(self):
         js = r"""
         onSuccess: function(transport) {
@@ -247,6 +288,68 @@ var  foo    =  "hey";
         self.assertMinified('x.replace(/\//, "_")// slash to underscore',
                 'x.replace(/\//,"_")')
 
+    def testSlashesNearComments(self):
+        original = '''
+        { a: n / 2, }
+        // comment
+        '''
+        expected = '''{a:n/2,}'''
+        self.assertMinified(original, expected)
+
+    def testReturn(self):
+        original = '''
+        return foo;//comment
+        return bar;'''
+        expected = 'return foo; return bar;'
+        self.assertMinified(original, expected)
+
+    def test_space_plus(self):
+        original = '"s" + ++e + "s"'
+        expected = '"s"+ ++e+"s"'
+        self.assertMinified(original, expected)
+
+    def test_no_final_newline(self):
+        original = '"s"'
+        expected = '"s"'
+        self.assertMinified(original, expected)
+
+    def test_space_with_regex_repeats(self):
+        original = '/(NaN| {2}|^$)/.test(a)&&(a="M 0 0");'
+        self.assertMinified(original, original)  # there should be nothing jsmin can do here
+
+    def test_space_with_regex_repeats_not_at_start(self):
+        original = 'aaa;/(NaN| {2}|^$)/.test(a)&&(a="M 0 0");'
+        self.assertMinified(original, original)  # there should be nothing jsmin can do here
+
+    def test_space_in_regex(self):
+        original = '/a (a)/.test("a")'
+        self.assertMinified(original, original)
+
+    def test_angular_1(self):
+        original = '''var /** holds major version number for IE or NaN for real browsers */
+                      msie,
+                      jqLite,           // delay binding since jQuery could be loaded after us.'''
+        minified = jsmin.jsmin(original)
+        self.assertTrue('var msie' in minified)
+
+    def test_angular_2(self):
+        original = 'var/* comment */msie;'
+        expected = 'var msie;'
+        self.assertMinified(original, expected)
+
+    def test_angular_3(self):
+        original = 'var /* comment */msie;'
+        expected = 'var msie;'
+        self.assertMinified(original, expected)
+
+    def test_angular_4(self):
+        original = 'var /* comment */ msie;'
+        expected = 'var msie;'
+        self.assertMinified(original, expected)
+
+    def test_angular_4(self):
+        original = 'a/b'
+        self.assertMinified(original, original)
 
 if __name__ == '__main__':
     unittest.main()

From 933728c53cfa889cfb2f458c7d9c240572ca73df Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Oct 2014 17:02:58 -0700
Subject: [PATCH 08/16] Bug 1039902 - Minify the Fennec JS code in automation.
 r=glandium

This patch adds a SpiderMonkey jsshell binary via tooltool and arranges
for it to be used in automation (more specifically, whenever JS_BINARY
is defined).

We'd prefer to build a host SpiderMonkey jsshell, but that's not trivial
right now; and we'd prefer to use a minifier better than the existing
Python jsmin (possibly written in JavaScript), but one step at a time.
---
 configure.in                                  |  3 +++
 mobile/android/config/js_wrapper.sh           | 20 +++++++++++++++++++
 mobile/android/config/mozconfigs/common       |  2 ++
 .../android-armv6/releng.manifest             |  7 +++++++
 .../android-x86/releng.manifest               |  7 +++++++
 .../android/releng.manifest                   |  7 +++++++
 mobile/android/installer/Makefile.in          |  7 +++++++
 7 files changed, 53 insertions(+)
 create mode 100755 mobile/android/config/js_wrapper.sh

diff --git a/configure.in b/configure.in
index 18833d8f03d1..20fa9b735228 100644
--- a/configure.in
+++ b/configure.in
@@ -8922,6 +8922,9 @@ AC_SUBST(MOZ_FOLD_LIBS)
 AC_SUBST(MOZ_ENABLE_SZIP)
 AC_SUBST(MOZ_SZIP_FLAGS)
 
+dnl Host JavaScript runtime, if any, to use during cross compiles.
+AC_SUBST(JS_BINARY)
+
 if test "$MOZ_DEBUG"; then
     MOZ_EM_DEBUG=1
 fi
diff --git a/mobile/android/config/js_wrapper.sh b/mobile/android/config/js_wrapper.sh
new file mode 100755
index 000000000000..464d5c63c91e
--- /dev/null
+++ b/mobile/android/config/js_wrapper.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+# 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/.
+
+# Wrapper for running SpiderMonkey js shell in automation with correct
+# LD_LIBRARY_PATH.
+
+# We don't have a reference to topsrcdir at this point, but we are invoked as
+# "$topsrcdir/mobile/android/config/js_wrapper.sh" so we can extract topsrcdir
+# from $0.
+topsrcdir=`cd \`dirname $0\`/../../..; pwd`
+
+JS_BINARY="$topsrcdir/jsshell/js"
+
+LD_LIBRARY_PATH="$topsrcdir/jsshell${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
+
+# Pass through all arguments and exit with status from js shell.
+exec "$JS_BINARY" "$@"
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 7f7b57aacabd..246a49b27d9b 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -53,3 +53,5 @@ ac_add_options --enable-stdcxx-compat
 mk_add_options "export ANT_HOME=$topsrcdir/apache-ant"
 
 mk_add_options "export PATH=$topsrcdir/apache-ant/bin:$PATH"
+
+JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
diff --git a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
index 9459628c693c..d2f3e4c44d10 100644
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
@@ -28,5 +28,12 @@
 "digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
 "algorithm": "sha512",
 "filename": "apache-ant-bin.tar.bz2"
+},
+{
+"size": 4906080,
+"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
+"algorithm": "sha512",
+"filename": "jsshell.tar.xz",
+"unpack": "True"
 }
 ]
diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
index 1e3cd8905c8a..256d5715911f 100644
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -28,5 +28,12 @@
 "digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
 "algorithm": "sha512",
 "filename": "apache-ant-bin.tar.bz2"
+},
+{
+"size": 4906080,
+"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
+"algorithm": "sha512",
+"filename": "jsshell.tar.xz",
+"unpack": "True"
 }
 ]
diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest
index 9459628c693c..d2f3e4c44d10 100644
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -28,5 +28,12 @@
 "digest": "e28b7a12fbbef02ad742958df8dd356ea2adb8ef79e95cd8eb8dbc953eb4cc11888969dac7d636187fd3ace9c63d9a6bc3d7795021c1d811a843e413fe5e52c9",
 "algorithm": "sha512",
 "filename": "apache-ant-bin.tar.bz2"
+},
+{
+"size": 4906080,
+"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
+"algorithm": "sha512",
+"filename": "jsshell.tar.xz",
+"unpack": "True"
 }
 ]
diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in
index c4e50168c2be..28258034ef2b 100644
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -35,6 +35,13 @@ MOZ_PACKAGER_MINIFY=1
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
+# Note that JS_BINARY can be defined in packager.mk, so this test must come
+# after including that file. MOZ_PACKAGER_MINIFY_JS is used in packager.mk, but
+# since recipe evaluation is deferred, we can set it here after the inclusion.
+ifneq (,$(JS_BINARY))
+MOZ_PACKAGER_MINIFY_JS=1
+endif
+
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)

From f721cff87e0fddb8a7e15e9b9ad72183d0b041db Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 31 Oct 2014 11:26:22 +1100
Subject: [PATCH 09/16] Bug 1091320 - fix legacy sync password and passphrase
 operations with incontent prefs. r=adw

---
 browser/components/preferences/in-content/sync.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index 078bcd60735a..c558c8ec7aef 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -126,9 +126,9 @@ let gSyncPane = {
     });
     setEventListener("syncViewQuota", "command", gSyncPane.openQuotaDialog);
     setEventListener("syncChangePassword", "command",
-      gSyncUtils.changePassword);
+      () => gSyncUtils.changePassword());
     setEventListener("syncResetPassphrase", "command",
-      gSyncUtils.resetPassphrase);
+      () => gSyncUtils.resetPassphrase());
     setEventListener("syncReset", "command", gSyncPane.resetSync);
     setEventListener("syncAddDeviceLabel", "click", function () {
       gSyncPane.openAddDevice();

From bc2bbb429607f20e12d893b7fb017cac23bf91fd Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 31 Oct 2014 11:29:54 +1100
Subject: [PATCH 10/16] Bug 1079563 (part 1) - replace use of async.js with
 promises in webchannel tests. r=MattN

---
 .../tests/xpcshell/test_web_channel.js        | 79 +++++++++----------
 .../tests/xpcshell/test_web_channel_broker.js | 54 ++++++-------
 2 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/toolkit/modules/tests/xpcshell/test_web_channel.js b/toolkit/modules/tests/xpcshell/test_web_channel.js
index f3e6ced61210..8fd01b1e9ae4 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel.js
@@ -5,7 +5,6 @@
 
 const Cu = Components.utils;
 
-Cu.import("resource://services-common/async.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
@@ -37,47 +36,45 @@ function run_test() {
 /**
  * Test channel listening
  */
-add_test(function test_web_channel_listen() {
-  let channel = new WebChannel(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN, {
-    broker: MockWebChannelBroker
+add_task(function test_web_channel_listen() {
+  return new Promise((resolve, reject) => {
+    let channel = new WebChannel(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN, {
+      broker: MockWebChannelBroker
+    });
+    let delivered = 0;
+    do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
+    do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
+    do_check_eq(channel._deliverCallback, null);
+
+    channel.listen(function(id, message, target) {
+      do_check_eq(id, VALID_WEB_CHANNEL_ID);
+      do_check_true(message);
+      do_check_true(message.command);
+      do_check_true(target.sender);
+      delivered++;
+      // 2 messages should be delivered
+      if (delivered === 2) {
+        channel.stopListening();
+        do_check_eq(channel._deliverCallback, null);
+        resolve();
+      }
+    });
+
+    // send two messages
+    channel.deliver({
+      id: VALID_WEB_CHANNEL_ID,
+      message: {
+        command: "one"
+      }
+    }, { sender: true });
+
+    channel.deliver({
+      id: VALID_WEB_CHANNEL_ID,
+      message: {
+        command: "two"
+      }
+    }, { sender: true });
   });
-  let cb = Async.makeSpinningCallback();
-  let delivered = 0;
-  do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
-  do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
-  do_check_eq(channel._deliverCallback, null);
-
-  channel.listen(function(id, message, target) {
-    do_check_eq(id, VALID_WEB_CHANNEL_ID);
-    do_check_true(message);
-    do_check_true(message.command);
-    do_check_true(target.sender);
-    delivered++;
-    // 2 messages should be delivered
-    if (delivered === 2) {
-      channel.stopListening();
-      do_check_eq(channel._deliverCallback, null);
-      cb();
-      run_next_test();
-    }
-  });
-
-  // send two messages
-  channel.deliver({
-    id: VALID_WEB_CHANNEL_ID,
-    message: {
-      command: "one"
-    }
-  }, { sender: true });
-
-  channel.deliver({
-    id: VALID_WEB_CHANNEL_ID,
-    message: {
-      command: "two"
-    }
-  }, { sender: true });
-
-  cb.wait();
 });
 
 
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
index 77f063806c46..3369cf5d22d7 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
@@ -5,7 +5,6 @@
 
 const Cu = Components.utils;
 
-Cu.import("resource://services-common/async.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
@@ -52,34 +51,33 @@ add_test(function test_web_channel_broker_channel_map() {
 /**
  * Test WebChannelBroker _listener test
  */
-add_test(function test_web_channel_broker_listener() {
-  let cb = Async.makeSpinningCallback();
-  var channel = new Object({
-    id: VALID_WEB_CHANNEL_ID,
-    origin: VALID_WEB_CHANNEL_ORIGIN,
-    deliver: function(data, sender) {
-      do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
-      do_check_eq(data.message.command, "hello");
-      WebChannelBroker.unregisterChannel(channel);
-      cb();
-      run_next_test();
-    }
-  });
-
-  WebChannelBroker.registerChannel(channel);
-
-  var mockEvent = {
-    data: {
+add_task(function test_web_channel_broker_listener() {
+  return new Promise((resolve, reject) => {
+    var channel = new Object({
       id: VALID_WEB_CHANNEL_ID,
-      message: {
-        command: "hello"
+      origin: VALID_WEB_CHANNEL_ORIGIN,
+      deliver: function(data, sender) {
+        do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
+        do_check_eq(data.message.command, "hello");
+        WebChannelBroker.unregisterChannel(channel);
+        resolve();
       }
-    },
-    principal: {
-      origin: URL_STRING
-    }
-  };
+    });
 
-  WebChannelBroker._listener(mockEvent);
-  cb.wait();
+    WebChannelBroker.registerChannel(channel);
+
+    var mockEvent = {
+      data: {
+        id: VALID_WEB_CHANNEL_ID,
+        message: {
+          command: "hello"
+        }
+      },
+      principal: {
+        origin: URL_STRING
+      }
+    };
+
+    WebChannelBroker._listener(mockEvent);
+  });
 });

From d5771ccad3097e0e9974b56c1e167f70ed0facf2 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 31 Oct 2014 11:29:54 +1100
Subject: [PATCH 11/16] Bug 1079563 (part 2) - allow white-listed sites to
 request troubleshooting info. r=MattN

---
 browser/app/default_permissions               |  4 ++
 browser/base/content/browser.js               | 17 +++++
 browser/base/content/test/general/browser.ini |  3 +
 .../general/browser_remoteTroubleshoot.js     | 64 +++++++++++++++++++
 .../test/general/test_remoteTroubleshoot.html | 41 ++++++++++++
 toolkit/modules/WebChannel.jsm                | 51 ++++++++++++---
 .../tests/xpcshell/test_web_channel.js        | 54 +++++++++++++++-
 .../tests/xpcshell/test_web_channel_broker.js |  4 +-
 8 files changed, 225 insertions(+), 13 deletions(-)
 create mode 100644 browser/base/content/test/general/browser_remoteTroubleshoot.js
 create mode 100644 browser/base/content/test/general/test_remoteTroubleshoot.html

diff --git a/browser/app/default_permissions b/browser/app/default_permissions
index 98dc2e718630..9c421e8510e0 100644
--- a/browser/app/default_permissions
+++ b/browser/app/default_permissions
@@ -14,3 +14,7 @@ host	uitour	1	about:home
 # XPInstall
 host	install	1	addons.mozilla.org
 host	install	1	marketplace.firefox.com
+
+# Remote troubleshooting
+host	remote-troubleshooting	1	input.mozilla.org
+host	remote-troubleshooting	1	support.mozilla.org
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a2b4332ccd1f..31a7ec27967c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -34,6 +34,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "AboutHome",
 XPCOMUtils.defineLazyServiceGetter(this, "gDNSService",
                                    "@mozilla.org/network/dns-service;1",
                                    "nsIDNSService");
+XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
+                                  "resource://gre/modules/WebChannel.jsm");
 
 const nsIWebNavigation = Ci.nsIWebNavigation;
 
@@ -1299,6 +1301,21 @@ var gBrowserInit = {
     gNavToolbox.addEventListener("customizationchange", CustomizationHandler);
     gNavToolbox.addEventListener("customizationending", CustomizationHandler);
 
+    // Initialize "remote troubleshooting" code...
+    let channel = new WebChannel("remote-troubleshooting", "remote-troubleshooting");
+    channel.listen((id, data, target) => {
+      if (data.command == "request") {
+        let {Troubleshoot} = Cu.import("resource://gre/modules/Troubleshoot.jsm", {});
+        Troubleshoot.snapshot(data => {
+          // for privacy we remove crash IDs and all preferences (but bug 1091944
+          // exists to expose prefs once we are confident of privacy implications)
+          delete data.crashes;
+          delete data.modifiedPreferences;
+          channel.send(data, target);
+        });
+      }
+    });
+
     // End startup crash tracking after a delay to catch crashes while restoring
     // tabs and to postpone saving the pref to disk.
     try {
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 7afd169ca76d..735bbd984bfd 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -389,6 +389,9 @@ skip-if = buildapp == 'mulet'
 [browser_private_no_prompt.js]
 skip-if = buildapp == 'mulet'
 [browser_relatedTabs.js]
+[browser_remoteTroubleshoot.js]
+support-files =
+  test_remoteTroubleshoot.html
 [browser_removeTabsToTheEnd.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 skip-if = e10s
diff --git a/browser/base/content/test/general/browser_remoteTroubleshoot.js b/browser/base/content/test/general/browser_remoteTroubleshoot.js
new file mode 100644
index 000000000000..93bd466f9dea
--- /dev/null
+++ b/browser/base/content/test/general/browser_remoteTroubleshoot.js
@@ -0,0 +1,64 @@
+/* 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 {WebChannel} = Cu.import("resource://gre/modules/WebChannel.jsm", {});
+
+const TEST_URL_TAIL = "example.com/browser/browser/base/content/test/general/test_remoteTroubleshoot.html"
+const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URL_TAIL, null, null);
+const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URL_TAIL, null, null);
+
+// Creates a one-shot web-channel for the test data to be sent back from the test page.
+function promiseChannelResponse(channelID, originOrPermission) {
+  return new Promise((resolve, reject) => {
+    let channel = new WebChannel(channelID, originOrPermission);
+    channel.listen((id, data, target) => {
+      channel.stopListening();
+      resolve(data);
+    });
+  });
+};
+
+// Loads the specified URI in a new tab and waits for it to send us data on our
+// test web-channel and resolves with that data.
+function promiseNewChannelResponse(uri) {
+  let channelPromise = promiseChannelResponse("test-remote-troubleshooting-backchannel",
+                                              uri);
+  let tab = gBrowser.loadOneTab(uri.spec, { inBackground: false });
+  return promiseTabLoaded(tab).then(
+    () => channelPromise
+  ).then(data => {
+    gBrowser.removeTab(tab);
+    return data;
+  });
+}
+
+add_task(function*() {
+  // We haven't set a permission yet - so even the "good" URI should fail.
+  let got = yield promiseNewChannelResponse(TEST_URI_GOOD);
+  // Should have no data.
+  Assert.ok(got.message === undefined, "should have failed to get any data");
+
+  // Add a permission manager entry for our URI.
+  Services.perms.add(TEST_URI_GOOD,
+                     "remote-troubleshooting",
+                     Services.perms.ALLOW_ACTION);
+  registerCleanupFunction(() => {
+    Services.perms.remove(TEST_URI_GOOD.spec, "remote-troubleshooting");
+  });
+
+  // Try again - now we are expecting a response with the actual data.
+  got = yield promiseNewChannelResponse(TEST_URI_GOOD);
+
+  // Check some keys we expect to always get.
+  Assert.ok(got.message.extensions, "should have extensions");
+  Assert.ok(got.message.graphics, "should have graphics");
+
+  // And check some keys we know we decline to return.
+  Assert.ok(!got.message.modifiedPreferences, "should not have a modifiedPreferences key");
+  Assert.ok(!got.message.crashes, "should not have crash info");
+
+  // Now a http:// URI - should get nothing even with the permission setup.
+  got = yield promiseNewChannelResponse(TEST_URI_BAD);
+  Assert.ok(got.message === undefined, "should have failed to get any data");
+});
diff --git a/browser/base/content/test/general/test_remoteTroubleshoot.html b/browser/base/content/test/general/test_remoteTroubleshoot.html
new file mode 100644
index 000000000000..fbf4ab661f3b
--- /dev/null
+++ b/browser/base/content/test/general/test_remoteTroubleshoot.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<html>
+<script>
+// Add a listener for responses to our remote requests.
+window.addEventListener("WebChannelMessageToContent", function (event) {
+  if (event.detail.id == "remote-troubleshooting") {
+    // Send what we got back to the test.
+    var backEvent = new window.CustomEvent("WebChannelMessageToChrome", {
+      detail: {
+        id: "test-remote-troubleshooting-backchannel",
+        message: {
+          message: event.detail.message,
+        },
+      },
+    });
+    window.dispatchEvent(backEvent);
+    // and stick it in our DOM just for good measure/diagnostics.
+    document.getElementById("troubleshooting").textContent =
+      JSON.stringify(event.detail.message, null, 2);
+  }
+});
+
+// Make a request for the troubleshooting data as we load.
+window.onload = function() {
+  var event = new window.CustomEvent("WebChannelMessageToChrome", {
+    detail: {
+      id: "remote-troubleshooting",
+      message: {
+        command: "request",
+      },
+    },
+  });
+  window.dispatchEvent(event);
+}
+</script>
+
+<body>
+  <pre id="troubleshooting"/>
+</body>
+
+</html>
diff --git a/toolkit/modules/WebChannel.jsm b/toolkit/modules/WebChannel.jsm
index 979cd3373819..461be78978f4 100644
--- a/toolkit/modules/WebChannel.jsm
+++ b/toolkit/modules/WebChannel.jsm
@@ -77,7 +77,7 @@ let WebChannelBroker = Object.create({
 
         for (var channel of this._channelMap.keys()) {
           if (channel.id === data.id &&
-            channel.origin.prePath === event.principal.origin) {
+            channel._originCheckCallback(event.principal)) {
             validChannelFound = true;
             channel.deliver(data, sender);
           }
@@ -133,17 +133,43 @@ let WebChannelBroker = Object.create({
  *
  * @param id {String}
  *        WebChannel id
- * @param origin {nsIURI}
- *        Valid origin that should be part of requests for this channel
+ * @param originOrPermission {nsIURI/string}
+ *        If an nsIURI, a valid origin that should be part of requests for
+ *        this channel.  If a string, a permission for which the permission
+ *        manager will be checked to determine if the request is allowed. Note
+ *        that in addition to the permission manager check, the request must
+ *        be made over https://
  * @constructor
  */
-this.WebChannel = function(id, origin) {
-  if (!id || !origin) {
-    throw new Error("WebChannel id and origin are required.");
+this.WebChannel = function(id, originOrPermission) {
+  if (!id || !originOrPermission) {
+    throw new Error("WebChannel id and originOrPermission are required.");
   }
 
   this.id = id;
-  this.origin = origin;
+  // originOrPermission can be either an nsIURI or a string representing a
+  // permission name.
+  if (typeof originOrPermission == "string") {
+    this._originCheckCallback = requestPrincipal => {
+      // The permission manager operates on domain names rather than true
+      // origins (bug 1066517).  To mitigate that, we explicitly check that
+      // the scheme is https://.
+      let uri = Services.io.newURI(requestPrincipal.origin, null, null);
+      if (uri.scheme != "https") {
+        return false;
+      }
+      // OK - we have https - now we can check the permission.
+      let perm = Services.perms.testExactPermissionFromPrincipal(requestPrincipal,
+                                                                 originOrPermission);
+      return perm == Ci.nsIPermissionManager.ALLOW_ACTION;
+    }
+  } else {
+    // a simple URI, so just check for an exact match.
+    this._originCheckCallback = requestPrincipal => {
+      return originOrPermission.prePath === requestPrincipal.origin;
+    }
+  }
+  this._originOrPermission = originOrPermission;
 };
 
 this.WebChannel.prototype = {
@@ -154,9 +180,16 @@ this.WebChannel.prototype = {
   id: null,
 
   /**
-   * WebChannel origin
+   * The originOrPermission value passed to the constructor, mainly for
+   * debugging and tests.
    */
-  origin: null,
+  _originOrPermission: null,
+
+  /**
+   * Callback that will be called with the principal of an incoming message
+   * to check if the request should be dispatched to the listeners.
+   */
+  _originCheckCallback: null,
 
   /**
    * WebChannelBroker that manages WebChannels
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel.js b/toolkit/modules/tests/xpcshell/test_web_channel.js
index 8fd01b1e9ae4..b7a9cf34f62c 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel.js
@@ -8,10 +8,11 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
-const ERROR_ID_ORIGIN_REQUIRED = "WebChannel id and origin are required.";
+const ERROR_ID_ORIGIN_REQUIRED = "WebChannel id and originOrPermission are required.";
 const VALID_WEB_CHANNEL_ID = "id";
 const URL_STRING = "http://example.com";
 const VALID_WEB_CHANNEL_ORIGIN = Services.io.newURI(URL_STRING, null, null);
+const TEST_PERMISSION_NAME = "test-webchannel-permissions";
 
 let MockWebChannelBroker = {
   _channelMap: new Map(),
@@ -34,7 +35,7 @@ function run_test() {
  */
 
 /**
- * Test channel listening
+ * Test channel listening with originOrPermission being an nsIURI.
  */
 add_task(function test_web_channel_listen() {
   return new Promise((resolve, reject) => {
@@ -43,7 +44,54 @@ add_task(function test_web_channel_listen() {
     });
     let delivered = 0;
     do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
-    do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
+    do_check_eq(channel._originOrPermission.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
+    do_check_eq(channel._deliverCallback, null);
+
+    channel.listen(function(id, message, target) {
+      do_check_eq(id, VALID_WEB_CHANNEL_ID);
+      do_check_true(message);
+      do_check_true(message.command);
+      do_check_true(target.sender);
+      delivered++;
+      // 2 messages should be delivered
+      if (delivered === 2) {
+        channel.stopListening();
+        do_check_eq(channel._deliverCallback, null);
+        resolve();
+      }
+    });
+
+    // send two messages
+    channel.deliver({
+      id: VALID_WEB_CHANNEL_ID,
+      message: {
+        command: "one"
+      }
+    }, { sender: true });
+
+    channel.deliver({
+      id: VALID_WEB_CHANNEL_ID,
+      message: {
+        command: "two"
+      }
+    }, { sender: true });
+  });
+});
+
+/**
+ * Test channel listening with originOrPermission being a permission string.
+ */
+add_task(function test_web_channel_listen_permission() {
+  return new Promise((resolve, reject) => {
+    // add a new permission
+    Services.perms.add(VALID_WEB_CHANNEL_ORIGIN, TEST_PERMISSION_NAME, Services.perms.ALLOW_ACTION);
+    do_register_cleanup(() => Services.perms.remove(VALID_WEB_CHANNEL_ORIGIN.spec, TEST_PERMISSION_NAME));
+    let channel = new WebChannel(VALID_WEB_CHANNEL_ID, TEST_PERMISSION_NAME, {
+      broker: MockWebChannelBroker
+    });
+    let delivered = 0;
+    do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
+    do_check_eq(channel._originOrPermission, TEST_PERMISSION_NAME);
     do_check_eq(channel._deliverCallback, null);
 
     channel.listen(function(id, message, target) {
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
index 3369cf5d22d7..a2fbb86a17c7 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
@@ -55,7 +55,9 @@ add_task(function test_web_channel_broker_listener() {
   return new Promise((resolve, reject) => {
     var channel = new Object({
       id: VALID_WEB_CHANNEL_ID,
-      origin: VALID_WEB_CHANNEL_ORIGIN,
+      _originCheckCallback: requestPrincipal => {
+        return VALID_WEB_CHANNEL_ORIGIN.prePath === requestPrincipal.origin;
+      },
       deliver: function(data, sender) {
         do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
         do_check_eq(data.message.command, "hello");

From 3812547b2281aa079d3a382e8cae31eba69823d2 Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Thu, 30 Oct 2014 21:18:32 -0400
Subject: [PATCH 12/16] Bug 1089655 - crash in java: Unhandled error for
 GeckoRequest: FindInPage, r=wesj

---
 mobile/android/base/FindInPageBar.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/FindInPageBar.java b/mobile/android/base/FindInPageBar.java
index fa1c4ce2597e..e6e5fbe69189 100644
--- a/mobile/android/base/FindInPageBar.java
+++ b/mobile/android/base/FindInPageBar.java
@@ -16,6 +16,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,6 +25,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnClickListener, GeckoEventListener  {
+    private static final String LOGTAG = "FindInPageBar";
     private static final String REQUEST_ID = "FindInPageBar";
 
     private final Context mContext;
@@ -181,13 +183,23 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
     /**
      * Request find operation, and update matchCount results (current count and total).
      */
-    private void sendRequestToFinderHelper(String request, String searchString) {
+    private void sendRequestToFinderHelper(final String request, final String searchString) {
         GeckoAppShell.sendRequestToGecko(new GeckoRequest(request, searchString) {
             @Override
             public void onResponse(NativeJSObject nativeJSObject) {
                 final int total = nativeJSObject.optInt("total", 0);
                 final int current = nativeJSObject.optInt("current", 0);
+                updateResult(total, current);
+            }
 
+            public void onError() {
+                // Gecko didn't respond due to state change, javascript error, etc.
+                updateResult(0, 0);
+                Log.d(LOGTAG, "No response from Gecko on request to match string: [" +
+                    searchString + "]");
+            }
+
+            private void updateResult(int total, int current) {
                 final Boolean statusVisibility = (total > 0);
                 final String statusText = current + "/" + total;
 

From f3db1d50c388bdb028b5129a83bb518b8f885031 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 31 Oct 2014 06:20:36 +0100
Subject: [PATCH 13/16] Backed out changeset 780d8f101fe0 (bug 1079563)

---
 browser/app/default_permissions               |  4 --
 browser/base/content/browser.js               | 17 -----
 browser/base/content/test/general/browser.ini |  3 -
 .../general/browser_remoteTroubleshoot.js     | 64 -------------------
 .../test/general/test_remoteTroubleshoot.html | 41 ------------
 toolkit/modules/WebChannel.jsm                | 51 +++------------
 .../tests/xpcshell/test_web_channel.js        | 54 +---------------
 .../tests/xpcshell/test_web_channel_broker.js |  4 +-
 8 files changed, 13 insertions(+), 225 deletions(-)
 delete mode 100644 browser/base/content/test/general/browser_remoteTroubleshoot.js
 delete mode 100644 browser/base/content/test/general/test_remoteTroubleshoot.html

diff --git a/browser/app/default_permissions b/browser/app/default_permissions
index 9c421e8510e0..98dc2e718630 100644
--- a/browser/app/default_permissions
+++ b/browser/app/default_permissions
@@ -14,7 +14,3 @@ host	uitour	1	about:home
 # XPInstall
 host	install	1	addons.mozilla.org
 host	install	1	marketplace.firefox.com
-
-# Remote troubleshooting
-host	remote-troubleshooting	1	input.mozilla.org
-host	remote-troubleshooting	1	support.mozilla.org
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 31a7ec27967c..a2b4332ccd1f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -34,8 +34,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "AboutHome",
 XPCOMUtils.defineLazyServiceGetter(this, "gDNSService",
                                    "@mozilla.org/network/dns-service;1",
                                    "nsIDNSService");
-XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
-                                  "resource://gre/modules/WebChannel.jsm");
 
 const nsIWebNavigation = Ci.nsIWebNavigation;
 
@@ -1301,21 +1299,6 @@ var gBrowserInit = {
     gNavToolbox.addEventListener("customizationchange", CustomizationHandler);
     gNavToolbox.addEventListener("customizationending", CustomizationHandler);
 
-    // Initialize "remote troubleshooting" code...
-    let channel = new WebChannel("remote-troubleshooting", "remote-troubleshooting");
-    channel.listen((id, data, target) => {
-      if (data.command == "request") {
-        let {Troubleshoot} = Cu.import("resource://gre/modules/Troubleshoot.jsm", {});
-        Troubleshoot.snapshot(data => {
-          // for privacy we remove crash IDs and all preferences (but bug 1091944
-          // exists to expose prefs once we are confident of privacy implications)
-          delete data.crashes;
-          delete data.modifiedPreferences;
-          channel.send(data, target);
-        });
-      }
-    });
-
     // End startup crash tracking after a delay to catch crashes while restoring
     // tabs and to postpone saving the pref to disk.
     try {
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 735bbd984bfd..7afd169ca76d 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -389,9 +389,6 @@ skip-if = buildapp == 'mulet'
 [browser_private_no_prompt.js]
 skip-if = buildapp == 'mulet'
 [browser_relatedTabs.js]
-[browser_remoteTroubleshoot.js]
-support-files =
-  test_remoteTroubleshoot.html
 [browser_removeTabsToTheEnd.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 skip-if = e10s
diff --git a/browser/base/content/test/general/browser_remoteTroubleshoot.js b/browser/base/content/test/general/browser_remoteTroubleshoot.js
deleted file mode 100644
index 93bd466f9dea..000000000000
--- a/browser/base/content/test/general/browser_remoteTroubleshoot.js
+++ /dev/null
@@ -1,64 +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/. */
-
-let {WebChannel} = Cu.import("resource://gre/modules/WebChannel.jsm", {});
-
-const TEST_URL_TAIL = "example.com/browser/browser/base/content/test/general/test_remoteTroubleshoot.html"
-const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URL_TAIL, null, null);
-const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URL_TAIL, null, null);
-
-// Creates a one-shot web-channel for the test data to be sent back from the test page.
-function promiseChannelResponse(channelID, originOrPermission) {
-  return new Promise((resolve, reject) => {
-    let channel = new WebChannel(channelID, originOrPermission);
-    channel.listen((id, data, target) => {
-      channel.stopListening();
-      resolve(data);
-    });
-  });
-};
-
-// Loads the specified URI in a new tab and waits for it to send us data on our
-// test web-channel and resolves with that data.
-function promiseNewChannelResponse(uri) {
-  let channelPromise = promiseChannelResponse("test-remote-troubleshooting-backchannel",
-                                              uri);
-  let tab = gBrowser.loadOneTab(uri.spec, { inBackground: false });
-  return promiseTabLoaded(tab).then(
-    () => channelPromise
-  ).then(data => {
-    gBrowser.removeTab(tab);
-    return data;
-  });
-}
-
-add_task(function*() {
-  // We haven't set a permission yet - so even the "good" URI should fail.
-  let got = yield promiseNewChannelResponse(TEST_URI_GOOD);
-  // Should have no data.
-  Assert.ok(got.message === undefined, "should have failed to get any data");
-
-  // Add a permission manager entry for our URI.
-  Services.perms.add(TEST_URI_GOOD,
-                     "remote-troubleshooting",
-                     Services.perms.ALLOW_ACTION);
-  registerCleanupFunction(() => {
-    Services.perms.remove(TEST_URI_GOOD.spec, "remote-troubleshooting");
-  });
-
-  // Try again - now we are expecting a response with the actual data.
-  got = yield promiseNewChannelResponse(TEST_URI_GOOD);
-
-  // Check some keys we expect to always get.
-  Assert.ok(got.message.extensions, "should have extensions");
-  Assert.ok(got.message.graphics, "should have graphics");
-
-  // And check some keys we know we decline to return.
-  Assert.ok(!got.message.modifiedPreferences, "should not have a modifiedPreferences key");
-  Assert.ok(!got.message.crashes, "should not have crash info");
-
-  // Now a http:// URI - should get nothing even with the permission setup.
-  got = yield promiseNewChannelResponse(TEST_URI_BAD);
-  Assert.ok(got.message === undefined, "should have failed to get any data");
-});
diff --git a/browser/base/content/test/general/test_remoteTroubleshoot.html b/browser/base/content/test/general/test_remoteTroubleshoot.html
deleted file mode 100644
index fbf4ab661f3b..000000000000
--- a/browser/base/content/test/general/test_remoteTroubleshoot.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<script>
-// Add a listener for responses to our remote requests.
-window.addEventListener("WebChannelMessageToContent", function (event) {
-  if (event.detail.id == "remote-troubleshooting") {
-    // Send what we got back to the test.
-    var backEvent = new window.CustomEvent("WebChannelMessageToChrome", {
-      detail: {
-        id: "test-remote-troubleshooting-backchannel",
-        message: {
-          message: event.detail.message,
-        },
-      },
-    });
-    window.dispatchEvent(backEvent);
-    // and stick it in our DOM just for good measure/diagnostics.
-    document.getElementById("troubleshooting").textContent =
-      JSON.stringify(event.detail.message, null, 2);
-  }
-});
-
-// Make a request for the troubleshooting data as we load.
-window.onload = function() {
-  var event = new window.CustomEvent("WebChannelMessageToChrome", {
-    detail: {
-      id: "remote-troubleshooting",
-      message: {
-        command: "request",
-      },
-    },
-  });
-  window.dispatchEvent(event);
-}
-</script>
-
-<body>
-  <pre id="troubleshooting"/>
-</body>
-
-</html>
diff --git a/toolkit/modules/WebChannel.jsm b/toolkit/modules/WebChannel.jsm
index 461be78978f4..979cd3373819 100644
--- a/toolkit/modules/WebChannel.jsm
+++ b/toolkit/modules/WebChannel.jsm
@@ -77,7 +77,7 @@ let WebChannelBroker = Object.create({
 
         for (var channel of this._channelMap.keys()) {
           if (channel.id === data.id &&
-            channel._originCheckCallback(event.principal)) {
+            channel.origin.prePath === event.principal.origin) {
             validChannelFound = true;
             channel.deliver(data, sender);
           }
@@ -133,43 +133,17 @@ let WebChannelBroker = Object.create({
  *
  * @param id {String}
  *        WebChannel id
- * @param originOrPermission {nsIURI/string}
- *        If an nsIURI, a valid origin that should be part of requests for
- *        this channel.  If a string, a permission for which the permission
- *        manager will be checked to determine if the request is allowed. Note
- *        that in addition to the permission manager check, the request must
- *        be made over https://
+ * @param origin {nsIURI}
+ *        Valid origin that should be part of requests for this channel
  * @constructor
  */
-this.WebChannel = function(id, originOrPermission) {
-  if (!id || !originOrPermission) {
-    throw new Error("WebChannel id and originOrPermission are required.");
+this.WebChannel = function(id, origin) {
+  if (!id || !origin) {
+    throw new Error("WebChannel id and origin are required.");
   }
 
   this.id = id;
-  // originOrPermission can be either an nsIURI or a string representing a
-  // permission name.
-  if (typeof originOrPermission == "string") {
-    this._originCheckCallback = requestPrincipal => {
-      // The permission manager operates on domain names rather than true
-      // origins (bug 1066517).  To mitigate that, we explicitly check that
-      // the scheme is https://.
-      let uri = Services.io.newURI(requestPrincipal.origin, null, null);
-      if (uri.scheme != "https") {
-        return false;
-      }
-      // OK - we have https - now we can check the permission.
-      let perm = Services.perms.testExactPermissionFromPrincipal(requestPrincipal,
-                                                                 originOrPermission);
-      return perm == Ci.nsIPermissionManager.ALLOW_ACTION;
-    }
-  } else {
-    // a simple URI, so just check for an exact match.
-    this._originCheckCallback = requestPrincipal => {
-      return originOrPermission.prePath === requestPrincipal.origin;
-    }
-  }
-  this._originOrPermission = originOrPermission;
+  this.origin = origin;
 };
 
 this.WebChannel.prototype = {
@@ -180,16 +154,9 @@ this.WebChannel.prototype = {
   id: null,
 
   /**
-   * The originOrPermission value passed to the constructor, mainly for
-   * debugging and tests.
+   * WebChannel origin
    */
-  _originOrPermission: null,
-
-  /**
-   * Callback that will be called with the principal of an incoming message
-   * to check if the request should be dispatched to the listeners.
-   */
-  _originCheckCallback: null,
+  origin: null,
 
   /**
    * WebChannelBroker that manages WebChannels
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel.js b/toolkit/modules/tests/xpcshell/test_web_channel.js
index b7a9cf34f62c..8fd01b1e9ae4 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel.js
@@ -8,11 +8,10 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
-const ERROR_ID_ORIGIN_REQUIRED = "WebChannel id and originOrPermission are required.";
+const ERROR_ID_ORIGIN_REQUIRED = "WebChannel id and origin are required.";
 const VALID_WEB_CHANNEL_ID = "id";
 const URL_STRING = "http://example.com";
 const VALID_WEB_CHANNEL_ORIGIN = Services.io.newURI(URL_STRING, null, null);
-const TEST_PERMISSION_NAME = "test-webchannel-permissions";
 
 let MockWebChannelBroker = {
   _channelMap: new Map(),
@@ -35,7 +34,7 @@ function run_test() {
  */
 
 /**
- * Test channel listening with originOrPermission being an nsIURI.
+ * Test channel listening
  */
 add_task(function test_web_channel_listen() {
   return new Promise((resolve, reject) => {
@@ -44,54 +43,7 @@ add_task(function test_web_channel_listen() {
     });
     let delivered = 0;
     do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
-    do_check_eq(channel._originOrPermission.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
-    do_check_eq(channel._deliverCallback, null);
-
-    channel.listen(function(id, message, target) {
-      do_check_eq(id, VALID_WEB_CHANNEL_ID);
-      do_check_true(message);
-      do_check_true(message.command);
-      do_check_true(target.sender);
-      delivered++;
-      // 2 messages should be delivered
-      if (delivered === 2) {
-        channel.stopListening();
-        do_check_eq(channel._deliverCallback, null);
-        resolve();
-      }
-    });
-
-    // send two messages
-    channel.deliver({
-      id: VALID_WEB_CHANNEL_ID,
-      message: {
-        command: "one"
-      }
-    }, { sender: true });
-
-    channel.deliver({
-      id: VALID_WEB_CHANNEL_ID,
-      message: {
-        command: "two"
-      }
-    }, { sender: true });
-  });
-});
-
-/**
- * Test channel listening with originOrPermission being a permission string.
- */
-add_task(function test_web_channel_listen_permission() {
-  return new Promise((resolve, reject) => {
-    // add a new permission
-    Services.perms.add(VALID_WEB_CHANNEL_ORIGIN, TEST_PERMISSION_NAME, Services.perms.ALLOW_ACTION);
-    do_register_cleanup(() => Services.perms.remove(VALID_WEB_CHANNEL_ORIGIN.spec, TEST_PERMISSION_NAME));
-    let channel = new WebChannel(VALID_WEB_CHANNEL_ID, TEST_PERMISSION_NAME, {
-      broker: MockWebChannelBroker
-    });
-    let delivered = 0;
-    do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
-    do_check_eq(channel._originOrPermission, TEST_PERMISSION_NAME);
+    do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
     do_check_eq(channel._deliverCallback, null);
 
     channel.listen(function(id, message, target) {
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
index a2fbb86a17c7..3369cf5d22d7 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
@@ -55,9 +55,7 @@ add_task(function test_web_channel_broker_listener() {
   return new Promise((resolve, reject) => {
     var channel = new Object({
       id: VALID_WEB_CHANNEL_ID,
-      _originCheckCallback: requestPrincipal => {
-        return VALID_WEB_CHANNEL_ORIGIN.prePath === requestPrincipal.origin;
-      },
+      origin: VALID_WEB_CHANNEL_ORIGIN,
       deliver: function(data, sender) {
         do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
         do_check_eq(data.message.command, "hello");

From a407c6dbd38cc6ca3eeb1c4cc213c8fed2e9fa9c Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 31 Oct 2014 06:22:07 +0100
Subject: [PATCH 14/16] Backed out changeset cb3179f8ea2b (bug 1079563) for bc
 memory leak test failures

---
 .../tests/xpcshell/test_web_channel.js        | 79 ++++++++++---------
 .../tests/xpcshell/test_web_channel_broker.js | 58 +++++++-------
 2 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/toolkit/modules/tests/xpcshell/test_web_channel.js b/toolkit/modules/tests/xpcshell/test_web_channel.js
index 8fd01b1e9ae4..f3e6ced61210 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel.js
@@ -5,6 +5,7 @@
 
 const Cu = Components.utils;
 
+Cu.import("resource://services-common/async.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
@@ -36,45 +37,47 @@ function run_test() {
 /**
  * Test channel listening
  */
-add_task(function test_web_channel_listen() {
-  return new Promise((resolve, reject) => {
-    let channel = new WebChannel(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN, {
-      broker: MockWebChannelBroker
-    });
-    let delivered = 0;
-    do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
-    do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
-    do_check_eq(channel._deliverCallback, null);
-
-    channel.listen(function(id, message, target) {
-      do_check_eq(id, VALID_WEB_CHANNEL_ID);
-      do_check_true(message);
-      do_check_true(message.command);
-      do_check_true(target.sender);
-      delivered++;
-      // 2 messages should be delivered
-      if (delivered === 2) {
-        channel.stopListening();
-        do_check_eq(channel._deliverCallback, null);
-        resolve();
-      }
-    });
-
-    // send two messages
-    channel.deliver({
-      id: VALID_WEB_CHANNEL_ID,
-      message: {
-        command: "one"
-      }
-    }, { sender: true });
-
-    channel.deliver({
-      id: VALID_WEB_CHANNEL_ID,
-      message: {
-        command: "two"
-      }
-    }, { sender: true });
+add_test(function test_web_channel_listen() {
+  let channel = new WebChannel(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN, {
+    broker: MockWebChannelBroker
   });
+  let cb = Async.makeSpinningCallback();
+  let delivered = 0;
+  do_check_eq(channel.id, VALID_WEB_CHANNEL_ID);
+  do_check_eq(channel.origin.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
+  do_check_eq(channel._deliverCallback, null);
+
+  channel.listen(function(id, message, target) {
+    do_check_eq(id, VALID_WEB_CHANNEL_ID);
+    do_check_true(message);
+    do_check_true(message.command);
+    do_check_true(target.sender);
+    delivered++;
+    // 2 messages should be delivered
+    if (delivered === 2) {
+      channel.stopListening();
+      do_check_eq(channel._deliverCallback, null);
+      cb();
+      run_next_test();
+    }
+  });
+
+  // send two messages
+  channel.deliver({
+    id: VALID_WEB_CHANNEL_ID,
+    message: {
+      command: "one"
+    }
+  }, { sender: true });
+
+  channel.deliver({
+    id: VALID_WEB_CHANNEL_ID,
+    message: {
+      command: "two"
+    }
+  }, { sender: true });
+
+  cb.wait();
 });
 
 
diff --git a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
index 3369cf5d22d7..77f063806c46 100644
--- a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
@@ -5,6 +5,7 @@
 
 const Cu = Components.utils;
 
+Cu.import("resource://services-common/async.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/WebChannel.jsm");
 
@@ -51,33 +52,34 @@ add_test(function test_web_channel_broker_channel_map() {
 /**
  * Test WebChannelBroker _listener test
  */
-add_task(function test_web_channel_broker_listener() {
-  return new Promise((resolve, reject) => {
-    var channel = new Object({
-      id: VALID_WEB_CHANNEL_ID,
-      origin: VALID_WEB_CHANNEL_ORIGIN,
-      deliver: function(data, sender) {
-        do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
-        do_check_eq(data.message.command, "hello");
-        WebChannelBroker.unregisterChannel(channel);
-        resolve();
-      }
-    });
-
-    WebChannelBroker.registerChannel(channel);
-
-    var mockEvent = {
-      data: {
-        id: VALID_WEB_CHANNEL_ID,
-        message: {
-          command: "hello"
-        }
-      },
-      principal: {
-        origin: URL_STRING
-      }
-    };
-
-    WebChannelBroker._listener(mockEvent);
+add_test(function test_web_channel_broker_listener() {
+  let cb = Async.makeSpinningCallback();
+  var channel = new Object({
+    id: VALID_WEB_CHANNEL_ID,
+    origin: VALID_WEB_CHANNEL_ORIGIN,
+    deliver: function(data, sender) {
+      do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
+      do_check_eq(data.message.command, "hello");
+      WebChannelBroker.unregisterChannel(channel);
+      cb();
+      run_next_test();
+    }
   });
+
+  WebChannelBroker.registerChannel(channel);
+
+  var mockEvent = {
+    data: {
+      id: VALID_WEB_CHANNEL_ID,
+      message: {
+        command: "hello"
+      }
+    },
+    principal: {
+      origin: URL_STRING
+    }
+  };
+
+  WebChannelBroker._listener(mockEvent);
+  cb.wait();
 });

From 8924ec66f60af482e2124a33235d6d8ad2907457 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 31 Oct 2014 01:38:58 -0400
Subject: [PATCH 15/16] Bug 1085694: Add SessionStore tests for crashed tabs.
 r=ttaubert,smacleod.

--HG--
extra : rebase_source : 4957b2264ac7afcc165f8a472ac9608f812688a8
---
 .../components/sessionstore/test/browser.ini  |   2 +
 .../sessionstore/test/browser_crashedTabs.js  | 328 ++++++++++++++++++
 browser/components/sessionstore/test/head.js  |  23 ++
 3 files changed, 353 insertions(+)
 create mode 100644 browser/components/sessionstore/test/browser_crashedTabs.js

diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
index 46f94e04c262..5aaf59c490e7 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -65,6 +65,8 @@ support-files =
 [browser_broadcast.js]
 [browser_capabilities.js]
 [browser_cleaner.js]
+[browser_crashedTabs.js]
+skip-if = !e10s || os == "linux" # Waiting on OMTC enabled by default on Linux (Bug 994541)
 [browser_dying_cache.js]
 [browser_dynamic_frames.js]
 [browser_form_restore_events.js]
diff --git a/browser/components/sessionstore/test/browser_crashedTabs.js b/browser/components/sessionstore/test/browser_crashedTabs.js
new file mode 100644
index 000000000000..0915b5fce91d
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_crashedTabs.js
@@ -0,0 +1,328 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const PAGE_1 = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
+const PAGE_2 = "data:text/html,<html><body>Another%20regular,%20everyday,%20normal%20page.";
+
+/**
+ * Returns a Promise that resolves once a remote <xul:browser> has experienced
+ * a crash. Also does the job of cleaning up the minidump of the crash.
+ *
+ * @param browser
+ *        The <xul:browser> that will crash
+ * @return Promise
+ */
+function crashBrowser(browser) {
+  // This frame script is injected into the remote browser, and used to
+  // intentionally crash the tab. We crash by using js-ctypes and dereferencing
+  // a bad pointer. The crash should happen immediately upon loading this
+  // frame script.
+  let frame_script = () => {
+    const Cu = Components.utils;
+    Cu.import("resource://gre/modules/ctypes.jsm");
+
+    let dies = function() {
+      let zero = new ctypes.intptr_t(8);
+      let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+      badptr.contents
+    };
+
+    dump("Et tu, Brute?");
+    dies();
+  }
+
+  let crashCleanupPromise = new Promise((resolve, reject) => {
+    let observer = (subject, topic, data) => {
+      is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
+      ok(subject instanceof Ci.nsIPropertyBag2,
+         'Subject implements nsIPropertyBag2.');
+      // we might see this called as the process terminates due to previous tests.
+      // We are only looking for "abnormal" exits...
+      if (!subject.hasKey("abnormal")) {
+        info("This is a normal termination and isn't the one we are looking for...");
+        return;
+      }
+
+      let dumpID;
+      if ('nsICrashReporter' in Ci) {
+        dumpID = subject.getPropertyAsAString('dumpID');
+        ok(dumpID, "dumpID is present and not an empty string");
+      }
+
+      if (dumpID) {
+        let minidumpDirectory = getMinidumpDirectory();
+        removeFile(minidumpDirectory, dumpID + '.dmp');
+        removeFile(minidumpDirectory, dumpID + '.extra');
+      }
+
+      Services.obs.removeObserver(observer, 'ipc:content-shutdown');
+      resolve();
+    };
+
+    Services.obs.addObserver(observer, 'ipc:content-shutdown');
+  });
+
+  let aboutTabCrashedLoadPromise = new Promise((resolve, reject) => {
+    browser.addEventListener("AboutTabCrashedLoad", function onCrash() {
+      browser.removeEventListener("AboutTabCrashedLoad", onCrash, false);
+      resolve();
+    }, false, true);
+  });
+
+  // This frame script will crash the remote browser as soon as it is
+  // evaluated.
+  let mm = browser.messageManager;
+  mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  return Promise.all([crashCleanupPromise, aboutTabCrashedLoadPromise]);
+}
+
+/**
+ * Returns the directory where crash dumps are stored.
+ *
+ * @return nsIFile
+ */
+function getMinidumpDirectory() {
+  let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+  dir.append("minidumps");
+  return dir;
+}
+
+/**
+ * Removes a file from a directory. This is a no-op if the file does not
+ * exist.
+ *
+ * @param directory
+ *        The nsIFile representing the directory to remove from.
+ * @param filename
+ *        A string for the file to remove from the directory.
+ */
+function removeFile(directory, filename) {
+  let file = directory.clone();
+  file.append(filename);
+  if (file.exists()) {
+    file.remove(false);
+  }
+}
+
+/**
+ * Checks the documentURI of the root document of a remote browser
+ * to see if it equals URI. Returns a Promise that resolves if
+ * there is a match, and rejects with an error message if they
+ * do not match.
+ *
+ * @param browser
+ *        The remote <xul:browser> to check the root document URI in.
+ * @param URI
+ *        A string to match the root document URI against.
+ * @return Promise
+ */
+function promiseContentDocumentURIEquals(browser, URI) {
+  return new Promise((resolve, reject) => {
+    let frame_script = () => {
+      sendAsyncMessage("test:documenturi", {
+        uri: content.document.documentURI,
+      });
+    };
+
+    let mm = browser.messageManager;
+    mm.addMessageListener("test:documenturi", function onMessage(message) {
+      mm.removeMessageListener("test:documenturi", onMessage);
+      let contentURI = message.data.uri;
+      if (contentURI == URI) {
+        resolve();
+      } else {
+        reject(`Content has URI ${contentURI} which does not match ${URI}`);
+      }
+    });
+
+    mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  });
+}
+
+/**
+ * Checks the window.history.length of the root window of a remote
+ * browser to see if it equals length. Returns a Promise that resolves
+ * if there is a match, and rejects with an error message if they
+ * do not match.
+ *
+ * @param browser
+ *        The remote <xul:browser> to check the root window.history.length
+ * @param length
+ *        The expected history length
+ * @return Promise
+ */
+function promiseHistoryLength(browser, length) {
+  return new Promise((resolve, reject) => {
+    let frame_script = () => {
+      sendAsyncMessage("test:historylength", {
+        length: content.history.length,
+      });
+    };
+
+    let mm = browser.messageManager;
+    mm.addMessageListener("test:historylength", function onMessage(message) {
+      mm.removeMessageListener("test:historylength", onMessage);
+      let contentLength = message.data.length;
+      if (contentLength == length) {
+        resolve();
+      } else {
+        reject(`Content has window.history.length ${contentLength} which does ` +
+               `not equal expected ${length}`);
+      }
+    });
+
+    mm.loadFrameScript("data:,(" + frame_script.toString() + ")();", false);
+  });
+}
+
+/**
+ * Checks that if a tab crashes, that information about the tab crashed
+ * page does not get added to the tab history.
+ */
+add_task(function test_crash_page_not_in_history() {
+  let newTab = gBrowser.addTab();
+  gBrowser.selectedTab = newTab;
+  let browser = newTab.linkedBrowser;
+  ok(browser.isRemoteBrowser, "Should be a remote browser");
+  yield promiseBrowserLoaded(browser);
+
+  browser.loadURI(PAGE_1);
+  yield promiseBrowserLoaded(browser);
+  TabState.flush(browser);
+
+  // Crash the tab
+  yield crashBrowser(browser);
+  // Flush out any notifications from the crashed browser.
+  TabState.flush(browser);
+
+  // Check the tab state and make sure the tab crashed page isn't
+  // mentioned.
+  let {entries} = JSON.parse(ss.getTabState(newTab));
+  is(entries.length, 1, "Should have a single history entry");
+  is(entries[0].url, PAGE_1,
+    "Single entry should be the page we visited before crashing");
+
+  gBrowser.removeTab(newTab);
+});
+
+/**
+ * Checks that if a tab crashes, that when we browse away from that page
+ * to a non-blacklisted site (so the browser becomes remote again), that
+ * we record history for that new visit.
+ */
+add_task(function test_revived_history_from_remote() {
+  let newTab = gBrowser.addTab();
+  gBrowser.selectedTab = newTab;
+  let browser = newTab.linkedBrowser;
+  ok(browser.isRemoteBrowser, "Should be a remote browser");
+  yield promiseBrowserLoaded(browser);
+
+  browser.loadURI(PAGE_1);
+  yield promiseBrowserLoaded(browser);
+  TabState.flush(browser);
+
+  // Crash the tab
+  yield crashBrowser(browser);
+  // Flush out any notifications from the crashed browser.
+  TabState.flush(browser);
+
+  // Browse to a new site that will cause the browser to
+  // become remote again.
+  browser.loadURI(PAGE_2);
+  yield promiseBrowserLoaded(browser);
+  ok(browser.isRemoteBrowser, "Should be a remote browser");
+  TabState.flush(browser);
+
+  // Check the tab state and make sure the tab crashed page isn't
+  // mentioned.
+  let {entries} = JSON.parse(ss.getTabState(newTab));
+  is(entries.length, 2, "Should have two history entries");
+  is(entries[0].url, PAGE_1,
+    "First entry should be the page we visited before crashing");
+  is(entries[1].url, PAGE_2,
+    "Second entry should be the page we visited after crashing");
+
+  gBrowser.removeTab(newTab);
+});
+
+/**
+ * Checks that if a tab crashes, that when we browse away from that page
+ * to a blacklisted site (so the browser stays non-remote), that
+ * we record history for that new visit.
+ */
+add_task(function test_revived_history_from_non_remote() {
+  let newTab = gBrowser.addTab();
+  gBrowser.selectedTab = newTab;
+  let browser = newTab.linkedBrowser;
+  ok(browser.isRemoteBrowser, "Should be a remote browser");
+  yield promiseBrowserLoaded(browser);
+
+  browser.loadURI(PAGE_1);
+  yield promiseBrowserLoaded(browser);
+  TabState.flush(browser);
+
+  // Crash the tab
+  yield crashBrowser(browser);
+  // Flush out any notifications from the crashed browser.
+  TabState.flush(browser);
+
+  // Browse to a new site that will not cause the browser to
+  // become remote again.
+  browser.loadURI("about:mozilla");
+  yield promiseBrowserLoaded(browser);
+  ok(!browser.isRemoteBrowser, "Should not be a remote browser");
+  TabState.flush(browser);
+
+  // Check the tab state and make sure the tab crashed page isn't
+  // mentioned.
+  let {entries} = JSON.parse(ss.getTabState(newTab));
+  is(entries.length, 2, "Should have two history entries");
+  is(entries[0].url, PAGE_1,
+    "First entry should be the page we visited before crashing");
+  is(entries[1].url, "about:mozilla",
+    "Second entry should be the page we visited after crashing");
+
+  gBrowser.removeTab(newTab);
+});
+
+/**
+ * Checks that we can revive a crashed tab back to the page that
+ * it was on when it crashed.
+ */
+add_task(function test_revive_tab_from_session_store() {
+  let newTab = gBrowser.addTab();
+  gBrowser.selectedTab = newTab;
+  let browser = newTab.linkedBrowser;
+  ok(browser.isRemoteBrowser, "Should be a remote browser");
+  yield promiseBrowserLoaded(browser);
+
+  browser.loadURI(PAGE_1);
+  yield promiseBrowserLoaded(browser);
+
+  browser.loadURI(PAGE_2);
+  yield promiseBrowserLoaded(browser);
+
+  TabState.flush(browser);
+
+  // Crash the tab
+  yield crashBrowser(browser);
+  // Flush out any notifications from the crashed browser.
+  TabState.flush(browser);
+
+  // Use SessionStore to revive the tab
+  SessionStore.reviveCrashedTab(newTab);
+  yield promiseBrowserLoaded(browser);
+
+  // We can't just check browser.currentURI.spec, because from
+  // the outside, a crashed tab has the same URI as the page
+  // it crashed on (much like an about:neterror page). Instead,
+  // we have to use the documentURI on the content.
+  yield promiseContentDocumentURIEquals(browser, PAGE_2);
+
+  // We should also have two entries in the browser history.
+  yield promiseHistoryLength(browser, 2);
+
+  gBrowser.removeTab(newTab);
+});
\ No newline at end of file
diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index 939a05f76bd3..df0e0000723d 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -320,6 +320,29 @@ function whenBrowserUnloaded(aBrowser, aContainer, aCallback = next) {
     executeSoon(aCallback);
   }, true);
 }
+
+/**
+ * Loads a page in a browser, and returns a Promise that
+ * resolves once a "load" event has been fired within that
+ * browser.
+ *
+ * @param browser
+ *        The browser to load the page in.
+ * @param uri
+ *        The URI to load.
+ *
+ * @return Promise
+ */
+function loadPage(browser, uri) {
+  return new Promise((resolve, reject) => {
+    browser.addEventListener("load", function onLoad(event) {
+      browser.removeEventListener("load", onLoad, true);
+      resolve();
+    }, true);
+    browser.loadURI(uri);
+  });
+}
+
 function promiseBrowserUnloaded(aBrowser, aContainer) {
   return new Promise(resolve => {
     whenBrowserUnloaded(aBrowser, aContainer, resolve);

From a6e979f82f612dd34b3959a3f31855e39c598a84 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 31 Oct 2014 08:03:57 +0100
Subject: [PATCH 16/16] Backed out changeset c0f433bceae7 (bug 1053434) for
 frequent windows 7 debug memory leaks

---
 browser/base/content/browser-devedition.js    | 32 +++-----------
 .../test/general/browser_devedition.js        | 44 -------------------
 2 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/browser/base/content/browser-devedition.js b/browser/base/content/browser-devedition.js
index cec20f59f1d7..98b7285cb397 100644
--- a/browser/base/content/browser-devedition.js
+++ b/browser/base/content/browser-devedition.js
@@ -14,11 +14,10 @@ let DevEdition = {
 
   styleSheetLocation: "chrome://browser/skin/devedition.css",
   styleSheet: null,
-  defaultThemeID: "{972ce4c6-7e08-4474-a285-3208198ce6fd}",
 
   init: function () {
     this._updateDevtoolsThemeAttribute();
-    this._updateStyleSheetFromPrefs();
+    this._updateStyleSheet();
 
     // Listen for changes to all prefs except for complete themes.
     // No need for this since changing a complete theme requires a
@@ -26,27 +25,14 @@ let DevEdition = {
     Services.prefs.addObserver(this._lwThemePrefName, this, false);
     Services.prefs.addObserver(this._prefName, this, false);
     Services.prefs.addObserver(this._devtoolsThemePrefName, this, false);
-    Services.obs.addObserver(this, "lightweight-theme-styling-update", false);
   },
 
   observe: function (subject, topic, data) {
-    if (topic == "lightweight-theme-styling-update") {
-      let newTheme = JSON.parse(data);
-      if (!newTheme || newTheme.id === this.defaultThemeID) {
-        // A lightweight theme has been unapplied, so just re-read prefs.
-        this._updateStyleSheetFromPrefs();
-      } else {
-        // A lightweight theme has been applied, but the pref may not be
-        // set yet if this happened from customize menu or addons page.
-        this._toggleStyleSheet(false);
-      }
-    }
-
     if (topic == "nsPref:changed") {
       if (data == this._devtoolsThemePrefName) {
         this._updateDevtoolsThemeAttribute();
       } else {
-        this._updateStyleSheetFromPrefs();
+        this._updateStyleSheet();
       }
     }
   },
@@ -56,12 +42,11 @@ let DevEdition = {
     // to change colors based on the selected devtools theme.
     document.documentElement.setAttribute("devtoolstheme",
       Services.prefs.getCharPref(this._devtoolsThemePrefName));
-    if (this.styleSheet) {
-      ToolbarIconColor.inferFromText();
-    }
   },
 
-  _updateStyleSheetFromPrefs: function() {
+  _updateStyleSheet: function() {
+    // Only try to apply the dev edition theme if it is preffered
+    // on and there are no other themes applied.
     let lightweightThemeSelected = false;
     try {
       lightweightThemeSelected = Services.prefs.getBoolPref(this._lwThemePrefName);
@@ -75,24 +60,18 @@ let DevEdition = {
     let deveditionThemeEnabled = Services.prefs.getBoolPref(this._prefName) &&
       !lightweightThemeSelected && defaultThemeSelected;
 
-    this._toggleStyleSheet(deveditionThemeEnabled);
-  },
-
-  _toggleStyleSheet: function(deveditionThemeEnabled) {
     if (deveditionThemeEnabled && !this.styleSheet) {
       let styleSheetAttr = `href="${this.styleSheetLocation}" type="text/css"`;
       let styleSheet = this.styleSheet = document.createProcessingInstruction(
         'xml-stylesheet', styleSheetAttr);
       this.styleSheet.addEventListener("load", function onLoad() {
         styleSheet.removeEventListener("load", onLoad);
-        gBrowser.tabContainer._positionPinnedTabs();
         ToolbarIconColor.inferFromText();
       });
       document.insertBefore(this.styleSheet, document.documentElement);
     } else if (!deveditionThemeEnabled && this.styleSheet) {
       this.styleSheet.remove();
       this.styleSheet = null;
-      gBrowser.tabContainer._positionPinnedTabs();
       ToolbarIconColor.inferFromText();
     }
   },
@@ -101,7 +80,6 @@ let DevEdition = {
     Services.prefs.removeObserver(this._lwThemePrefName, this);
     Services.prefs.removeObserver(this._prefName, this);
     Services.prefs.removeObserver(this._devtoolsThemePrefName, this);
-    Services.obs.removeObserver(this, "lightweight-theme-styling-update", false);
     this.styleSheet = null;
   }
 };
diff --git a/browser/base/content/test/general/browser_devedition.js b/browser/base/content/test/general/browser_devedition.js
index 5a3b95bf8de3..8982f4e48459 100644
--- a/browser/base/content/test/general/browser_devedition.js
+++ b/browser/base/content/test/general/browser_devedition.js
@@ -65,49 +65,5 @@ function startTests() {
   is (document.documentElement.getAttribute("devtoolstheme"), "light",
     "The documentElement has an attribute based on devtools theme.");
 
-  testLightweightThemePreview();
   finish();
 }
-
-function dummyLightweightTheme(id) {
-  return {
-    id: id,
-    name: id,
-    headerURL: "http://lwttest.invalid/a.png",
-    footerURL: "http://lwttest.invalid/b.png",
-    textcolor: "red",
-    accentcolor: "blue"
-  };
-}
-
-function testLightweightThemePreview() {
-  let {LightweightThemeManager} = Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
-
-  info ("Turning the pref on, then previewing lightweight themes");
-  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
-  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
-  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview0"));
-  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a lightweight theme preview.");
-  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview1"));
-  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a second lightweight theme preview.");
-  LightweightThemeManager.resetPreview();
-  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled again after resetting the preview.");
-
-  info ("Turning the pref on, then previewing a theme, turning it off and resetting the preview");
-  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
-  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
-  LightweightThemeManager.previewTheme(dummyLightweightTheme("preview2"));
-  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after a lightweight theme preview.");
-  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, false);
-  ok (!DevEdition.styleSheet, "The devedition stylesheet is not enabled after pref is turned off.");
-  LightweightThemeManager.resetPreview();
-  ok (!DevEdition.styleSheet, "The devedition stylesheet is still disabled after resetting the preview.");
-
-  info ("Turning the pref on, then previewing the default theme, turning it off and resetting the preview");
-  Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
-  ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
-  LightweightThemeManager.previewTheme(dummyLightweightTheme("{972ce4c6-7e08-4474-a285-3208198ce6fd}"));
-  ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied.");
-  LightweightThemeManager.resetPreview();
-  ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview.");
-}