From f69c87efdbcaf5337c484f38bacb97869ac30c0b Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Fri, 26 Feb 2016 14:09:00 +0000
Subject: [PATCH 01/57] Bug 1205371 - Multi-state pseudo-class lock indicator.
 r=gl

---
 devtools/client/inspector/markup/markup.js    | 26 +++++-
 devtools/client/inspector/markup/markup.xhtml |  1 +
 devtools/client/themes/markup.css             | 84 +++++++++++++++++--
 3 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js
index 289c7c208f34..19d32be70bcf 100644
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -2502,10 +2502,30 @@ MarkupContainer.prototype = {
    * viewed node.
    */
   update: function () {
-    if (this.node.pseudoClassLocks.length) {
-      this.elt.classList.add("pseudoclass-locked");
+    this.elt.classList.remove("pseudoclass-hover");
+    this.elt.classList.remove("pseudoclass-active");
+    this.elt.classList.remove("pseudoclass-focus");
+    this.elt.removeAttribute("pseudoclass-count");
+
+    let {pseudoClassLocks} = this.node;
+
+    if (pseudoClassLocks.length) {
+      for (let state of pseudoClassLocks) {
+        switch (state) {
+          case ":hover":
+            this.elt.classList.add("pseudoclass-hover");
+            break;
+          case ":active":
+            this.elt.classList.add("pseudoclass-active");
+            break;
+          case ":focus":
+            this.elt.classList.add("pseudoclass-focus");
+            break;
+        }
+      }
+      this.elt.setAttribute("pseudoclass-count", pseudoClassLocks.length);
     } else {
-      this.elt.classList.remove("pseudoclass-locked");
+      this.elt.removeAttribute("pseudoclass-count");
     }
 
     if (this.editor.update) {
diff --git a/devtools/client/inspector/markup/markup.xhtml b/devtools/client/inspector/markup/markup.xhtml
index 47943631f6a1..cefed3928346 100644
--- a/devtools/client/inspector/markup/markup.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -25,6 +25,7 @@
 
     <ul class="children">
       <li id="template-elementcontainer" save="${elt}" class="child collapsed" role="presentation">
+        <div class="pseudoclass-locked-container"></div>
         <div save="${tagLine}" id="${id}" class="tag-line" role="treeitem" aria-level="${level}" aria-grabbed="${isDragging}"><!--
         --><span save="${tagState}" class="tag-state" role="presentation"></span><!--
         --><span save="${expander}" class="theme-twisty expander" role="presentation"></span><!--
diff --git a/devtools/client/themes/markup.css b/devtools/client/themes/markup.css
index c8a00ed73717..b4b31e2cac46 100644
--- a/devtools/client/themes/markup.css
+++ b/devtools/client/themes/markup.css
@@ -4,8 +4,14 @@
 
 :root {
   --markup-outline: var(--theme-splitter-color);
+
+  /* Pseudo-class lock indicators */
+  --hover-pseudo-background: var(--theme-highlight-green);
+  --active-pseudo-background: var(--theme-highlight-red);
+  --focus-pseudo-background: var(--theme-highlight-blue);
 }
 
+
 .theme-dark:root {
   --markup-outline: var(--theme-highlight-pink);
 }
@@ -255,20 +261,88 @@ ul.children + .tag-line::before {
   border: 1px solid #CCC;
 }
 
+/* Markup view elements with pseudo-class locks */
+
+.child:not([pseudoclass-count]) > .pseudoclass-locked-container {
+  display: none;
+}
+
 /* Draw a circle next to nodes that have a pseudo class lock.
    Center vertically with the 1.4em line height on .tag-line */
-.child.pseudoclass-locked::before {
-  content: "";
-  background: var(--theme-highlight-lightorange);
+.child[pseudoclass-count] > .pseudoclass-locked-container {
   border-radius: 50%;
   width: .8em;
   height: .8em;
-  margin-top: .3em;
-  left: 1px;
+  margin-top: .2em;
+  left: 0;
+  overflow: hidden;
   position: absolute;
   z-index: 1;
 }
 
+/* 1 pseudo-class lock */
+.child[pseudoclass-count="1"].pseudoclass-hover > .pseudoclass-locked-container {
+  background: var(--hover-pseudo-background);
+}
+
+.child[pseudoclass-count="1"].pseudoclass-active > .pseudoclass-locked-container {
+  background: var(--active-pseudo-background);
+}
+
+.child[pseudoclass-count="1"].pseudoclass-focus > .pseudoclass-locked-container {
+  background: var(--focus-pseudo-background);
+}
+
+/* 2 pseudo-class locks */
+.child[pseudoclass-count="2"] > .pseudoclass-locked-container::before,
+.child[pseudoclass-count="2"] > .pseudoclass-locked-container::after {
+  content: "";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background: var(--active-pseudo-background);
+}
+
+.child[pseudoclass-count="2"] > .pseudoclass-locked-container::after {
+  transform: rotate(45deg) translate(50%);
+}
+
+/* Colors for active lock are already on before/after, now let hover/focus override appropriately */
+.child[pseudoclass-count="2"].pseudoclass-hover > .pseudoclass-locked-container::before {
+  background: var(--hover-pseudo-background);
+}
+
+.child[pseudoclass-count="2"].pseudoclass-focus > .pseudoclass-locked-container::after {
+  background: var(--focus-pseudo-background);
+}
+
+/* 3 pseudo-class locks */
+.child[pseudoclass-count="3"] > .pseudoclass-locked-container {
+  background: var(--hover-pseudo-background);
+}
+
+.child[pseudoclass-count="3"] > .pseudoclass-locked-container::before,
+.child[pseudoclass-count="3"] > .pseudoclass-locked-container::after {
+  content: "";
+  display: block;
+  width: 0.53333em;
+  height: 0.47059em;
+}
+
+.child[pseudoclass-count="3"] > .pseudoclass-locked-container::before {
+  transform: rotate(90deg) skew(30deg);
+  margin-left: -0.10429em;
+  margin-top: 0.05em;
+  background: var(--active-pseudo-background);
+}
+
+.child[pseudoclass-count="3"] > .pseudoclass-locked-container::after {
+  transform: rotate(30deg) skew(30deg);
+  margin-left: 0.35783em;
+  margin-top: -0.47em;
+  background: var(--focus-pseudo-background);
+}
+
 /* Firebug Theme */
 
 .theme-firebug .theme-fg-color3 {

From 2ebfcec05164ffcc37329652e5ea675e2344eac3 Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Mon, 3 Oct 2016 14:08:54 -0700
Subject: [PATCH 02/57] bug 1307226 - extend clang crash workaround to work
 around similar crash in SetGridItemCount r=mats

MozReview-Commit-ID: 1fHN2mpYyxz

--HG--
extra : rebase_source : 564234074558f5ba7b966b9190504c4f10fa86df
---
 layout/generic/nsGridContainerFrame.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index 413bf6da5049..d59edb6ac91c 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -29,7 +29,7 @@
 #include "nsStyleContext.h"
 #include "mozilla/dom/GridBinding.h"
 
-#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__  == 6
+#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__ <= 8
 #define CLANG_CRASH_BUG 1
 #endif
 
@@ -420,8 +420,10 @@ public:
 
   void SetGridItemCount(size_t aGridItemCount)
   {
+#ifndef CLANG_CRASH_BUG
     MOZ_ASSERT(mIter.isSome() || mArray->Length() == aGridItemCount,
                "grid item count mismatch");
+#endif
     mGridItemCount.emplace(aGridItemCount);
     // Note: it's OK if mGridItemIndex underflows -- GridItemIndex()
     // will not be called unless there is at least one item.

From 15f306ba4940a9114280ddb3400c30567c3ed474 Mon Sep 17 00:00:00 2001
From: Bob Silverberg <bsilverberg@mozilla.com>
Date: Mon, 19 Sep 2016 16:47:28 -0400
Subject: [PATCH 03/57] Bug 1299551 - Update test_webextension_install.js to
 wait for add-ons to finish installing, r=kmag

MozReview-Commit-ID: KJKi3BA8mI1

--HG--
extra : rebase_source : 797851f4f805ea0f34a72a838a9096b39e193e3a
---
 .../xpcshell/test_webextension_install.js     | 153 +++++++++---------
 1 file changed, 81 insertions(+), 72 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js
index 839c64f410ba..d2f90efedb32 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js
@@ -110,14 +110,17 @@ add_task(function* test_multiple_no_id_extensions() {
     version: "1.0"
   };
 
-  const firstAddonDir = yield promiseWriteWebManifestForExtension(manifest, gTmpD,
-                                                     "addon-sub-dir-one");
-  const secondAddonDir = yield promiseWriteWebManifestForExtension(manifest, gTmpD,
-                                                      "addon-sub-dir-two");
-  const [firstAddon, secondAddon] = yield Promise.all([
-    AddonManager.installTemporaryAddon(firstAddonDir),
-    AddonManager.installTemporaryAddon(secondAddonDir)
-  ]);
+  let extension1 = ExtensionTestUtils.loadExtension({
+    manifest: manifest,
+    useAddonManager: "temporary",
+  });
+
+  let extension2 = ExtensionTestUtils.loadExtension({
+    manifest: manifest,
+    useAddonManager: "temporary",
+  });
+
+  yield Promise.all([extension1.startup(), extension2.startup()]);
 
   const allAddons = yield new Promise(resolve => {
     AddonManager.getAllAddons(addons => resolve(addons));
@@ -127,12 +130,8 @@ add_task(function* test_multiple_no_id_extensions() {
   // Make sure we have two add-ons by the same name.
   equal(filtered.length, 2, "Two add-ons are installed with the same name");
 
-  firstAddon.uninstall();
-  Services.obs.notifyObservers(firstAddonDir, "flush-cache-entry", null);
-  firstAddonDir.remove(true);
-  secondAddon.uninstall();
-  Services.obs.notifyObservers(secondAddonDir, "flush-cache-entry", null);
-  secondAddonDir.remove(true);
+  yield extension1.unload();
+  yield extension2.unload();
   AddonTestUtils.useRealCertChecks = false;
 });
 
@@ -156,13 +155,16 @@ add_task(function* test_bss_id() {
   let addon = yield promiseAddonByID(ID);
   equal(addon, null, "Add-on is not installed");
 
-  yield promiseWriteWebManifestForExtension(manifest, profileDir, ID);
-  yield promiseRestartManager();
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: manifest,
+    useAddonManager: "temporary",
+  });
+  yield extension.startup();
 
   addon = yield promiseAddonByID(ID);
   notEqual(addon, null, "Add-on is installed");
 
-  addon.uninstall();
+  yield extension.unload();
 });
 
 // Test that if we have IDs in both browser_specific_settings and applications,
@@ -190,15 +192,18 @@ add_task(function* test_two_ids() {
     }
   }
 
-  yield promiseWriteWebManifestForExtension(manifest, profileDir, GOOD_ID);
-  yield promiseRestartManager();
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: manifest,
+    useAddonManager: "temporary",
+  });
+  yield extension.startup();
 
   let addon = yield promiseAddonByID(BAD_ID);
   equal(addon, null, "Add-on is not found using bad ID");
   addon = yield promiseAddonByID(GOOD_ID);
   notEqual(addon, null, "Add-on is found using good ID");
 
-  addon.uninstall();
+  yield extension.unload();
 });
 
 // Test that strict_min_version and strict_max_version are enforced for
@@ -213,12 +218,6 @@ add_task(function* test_strict_min_max() {
     version: "1.0",
   };
 
-  function flushAndRemove(file) {
-    // flush JAR cache and remove the file
-    Services.obs.notifyObservers(file, "flush-cache-entry", null);
-    file.remove(true);
-  }
-
   // bad max good min
   let apps = {
     applications: {
@@ -231,18 +230,19 @@ add_task(function* test_strict_min_max() {
   }
   let testManifest = Object.assign(apps, MANIFEST);
 
-  let addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                              "the-addon-sub-dir");
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   let expectedMsg = new RegExp("Add-on strict_min_max@tests.mozilla.org is not compatible with application version. " +
                                "add-on minVersion: 1. add-on maxVersion: 1.");
-  yield Assert.rejects(AddonManager.installTemporaryAddon(addonDir),
+  yield Assert.rejects(extension.startup(),
                        expectedMsg,
                        "Install rejects when specified maxVersion is not valid");
 
   let addon = yield promiseAddonByID(addonId);
   equal(addon, null, "Add-on is not installed");
-  flushAndRemove(addonDir);
 
   // bad min good max
   apps = {
@@ -256,18 +256,19 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "the-addon-sub-dir");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   expectedMsg = new RegExp("Add-on strict_min_max@tests.mozilla.org is not compatible with application version. " +
-                               "add-on minVersion: 2. add-on maxVersion: 2.");
-  yield Assert.rejects(AddonManager.installTemporaryAddon(addonDir),
+                           "add-on minVersion: 2. add-on maxVersion: 2.");
+  yield Assert.rejects(extension.startup(),
                        expectedMsg,
                        "Install rejects when specified minVersion is not valid");
 
   addon = yield promiseAddonByID(addonId);
   equal(addon, null, "Add-on is not installed");
-  flushAndRemove(addonDir);
 
   // bad both
   apps = {
@@ -281,18 +282,19 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "the-addon-sub-dir");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   expectedMsg = new RegExp("Add-on strict_min_max@tests.mozilla.org is not compatible with application version. " +
-                               "add-on minVersion: 2. add-on maxVersion: 1.");
-  yield Assert.rejects(AddonManager.installTemporaryAddon(addonDir),
+                           "add-on minVersion: 2. add-on maxVersion: 1.");
+  yield Assert.rejects(extension.startup(),
                        expectedMsg,
                        "Install rejects when specified minVersion and maxVersion are not valid");
 
   addon = yield promiseAddonByID(addonId);
   equal(addon, null, "Add-on is not installed");
-  flushAndRemove(addonDir);
 
   // bad only min
   apps = {
@@ -305,18 +307,19 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "the-addon-sub-dir");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   expectedMsg = new RegExp("Add-on strict_min_max@tests.mozilla.org is not compatible with application version\. " +
                            "add-on minVersion: 2\.");
-  yield Assert.rejects(AddonManager.installTemporaryAddon(addonDir),
+  yield Assert.rejects(extension.startup(),
                        expectedMsg,
                        "Install rejects when specified minVersion and maxVersion are not valid");
 
   addon = yield promiseAddonByID(addonId);
   equal(addon, null, "Add-on is not installed");
-  flushAndRemove(addonDir);
 
   // bad only max
   apps = {
@@ -329,18 +332,19 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "the-addon-sub-dir");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   expectedMsg = new RegExp("Add-on strict_min_max@tests.mozilla.org is not compatible with application version\. " +
                            "add-on maxVersion: 1\.");
-  yield Assert.rejects(AddonManager.installTemporaryAddon(addonDir),
+  yield Assert.rejects(extension.startup(),
                        expectedMsg,
                        "Install rejects when specified minVersion and maxVersion are not valid");
 
   addon = yield promiseAddonByID(addonId);
   equal(addon, null, "Add-on is not installed");
-  flushAndRemove(addonDir);
 
   // good both
   apps = {
@@ -354,16 +358,17 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "strict_min_max");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
-  yield AddonManager.installTemporaryAddon(addonDir);
+  yield extension.startup();
   addon = yield promiseAddonByID(addonId);
 
   notEqual(addon, null, "Add-on is installed");
   equal(addon.id, addonId, "Installed add-on has the expected ID");
-  addon.uninstall();
-  flushAndRemove(addonDir);
+  yield extension.unload();
 
   // good only min
   let newId = "strict_min_only@tests.mozilla.org";
@@ -377,17 +382,18 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "strict_min_only");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
-  yield AddonManager.installTemporaryAddon(addonDir);
+  yield extension.startup();
   addon = yield promiseAddonByID(newId);
 
   notEqual(addon, null, "Add-on is installed");
   equal(addon.id, newId, "Installed add-on has the expected ID");
 
-  addon.uninstall();
-  flushAndRemove(addonDir);
+  yield extension.unload();
 
   // good only max
   newId = "strict_max_only@tests.mozilla.org";
@@ -401,17 +407,18 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "strict_max_only");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
-  yield AddonManager.installTemporaryAddon(addonDir);
+  yield extension.startup();
   addon = yield promiseAddonByID(newId);
 
   notEqual(addon, null, "Add-on is installed");
   equal(addon.id, newId, "Installed add-on has the expected ID");
 
-  addon.uninstall();
-  flushAndRemove(addonDir);
+  yield extension.unload();
 
   // * in min will throw an error
   for (let version of ["0.*", "0.*.0"]) {
@@ -427,17 +434,18 @@ add_task(function* test_strict_min_max() {
 
     let testManifest = Object.assign(apps, MANIFEST);
 
-    let addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                                             "strict_min_star");
+    let extension = ExtensionTestUtils.loadExtension({
+      manifest: testManifest,
+      useAddonManager: "temporary",
+    });
 
     yield Assert.rejects(
-      AddonManager.installTemporaryAddon(addonDir),
+      extension.startup(),
       /The use of '\*' in strict_min_version is invalid/,
       "loading an extension with a * in strict_min_version throws an exception");
 
     let addon = yield promiseAddonByID(newId);
     equal(addon, null, "Add-on is not installed");
-    flushAndRemove(addonDir);
   }
 
   // incompatible extension but with compatibility checking off
@@ -452,18 +460,19 @@ add_task(function* test_strict_min_max() {
   }
   testManifest = Object.assign(apps, MANIFEST);
 
-  addonDir = yield promiseWriteWebManifestForExtension(testManifest, gTmpD,
-                                          "checkCompatibility");
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: testManifest,
+    useAddonManager: "temporary",
+  });
 
   let savedCheckCompatibilityValue = AddonManager.checkCompatibility;
   AddonManager.checkCompatibility = false;
-  yield AddonManager.installTemporaryAddon(addonDir);
+  yield extension.startup();
   addon = yield promiseAddonByID(newId);
 
   notEqual(addon, null, "Add-on is installed");
   equal(addon.id, newId, "Installed add-on has the expected ID");
 
-  addon.uninstall();
-  flushAndRemove(addonDir);
+  yield extension.unload();
   AddonManager.checkCompatibility = savedCheckCompatibilityValue;
 });

From 9d81d721779a66f40f0abb378b3d729539de17b5 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Mon, 19 Sep 2016 17:18:07 -0700
Subject: [PATCH 04/57] Bug 1304531 - Remove CPOW (via shim usage) from the
 mochitest harness. r=Felipe

MozReview-Commit-ID: FturnOEMIV5

--HG--
extra : rebase_source : d87bfc63a503e4439b67a8cd0d4d5c6d222380fc
---
 testing/mochitest/browser-test.js             | 30 ++++++++-----------
 testing/mochitest/document-observer-script.js | 30 +++++++++++++++++++
 testing/mochitest/jar.mn                      |  1 +
 3 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 testing/mochitest/document-observer-script.js

diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
index c971a42f9d40..9a5e6eba49ae 100644
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -164,6 +164,13 @@ function Tester(aTests, structuredLogger, aCallback) {
   this.Promise = Components.utils.import("resource://gre/modules/Promise.jsm", null).Promise;
   this.Assert = Components.utils.import("resource://testing-common/Assert.jsm", null).Assert;
 
+  Services.ppmm.loadProcessScript("chrome://mochikit/content/document-observer-script.js", true);
+  Services.ppmm.addMessageListener("browser-test:documentCreated", (msg) => {
+    if (this.currentTest) {
+      this.onDocumentCreated(msg.data);
+    }
+  });
+
   this.SimpleTestOriginal = {};
   SIMPLETEST_OVERRIDES.forEach(m => {
     this.SimpleTestOriginal[m] = this.SimpleTest[m];
@@ -248,8 +255,6 @@ Tester.prototype = {
 
     this.structuredLogger.info("*** Start BrowserChrome Test Results ***");
     Services.console.registerListener(this);
-    Services.obs.addObserver(this, "chrome-document-global-created", false);
-    Services.obs.addObserver(this, "content-document-global-created", false);
     this._globalProperties = Object.keys(window);
     this._globalPropertyWhitelist = [
       "navigator", "constructor", "top",
@@ -366,12 +371,10 @@ Tester.prototype = {
       --this.repeat;
       this.currentTestIndex = -1;
       this.nextTest();
-    }
-    else{
+    } else {
       TabDestroyObserver.destroy();
       Services.console.unregisterListener(this);
-      Services.obs.removeObserver(this, "chrome-document-global-created");
-      Services.obs.removeObserver(this, "content-document-global-created");
+      Services.ppmm.broadcastAsyncMessage("browser-test:removeObservers", {});
       this.Promise.Debugging.clearUncaughtErrorObservers();
       this._treatUncaughtRejectionsAsFailures = false;
 
@@ -413,23 +416,16 @@ Tester.prototype = {
   observe: function Tester_observe(aSubject, aTopic, aData) {
     if (!aTopic) {
       this.onConsoleMessage(aSubject);
-    } else if (this.currentTest) {
-      this.onDocumentCreated(aSubject);
     }
   },
 
-  onDocumentCreated: function Tester_onDocumentCreated(aWindow) {
-    let utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                       .getInterface(Ci.nsIDOMWindowUtils);
-    let outerID = utils.outerWindowID;
-    let innerID = utils.currentInnerWindowID;
-
+  onDocumentCreated: function Tester_onDocumentCreated({ location, outerID, innerID }) {
     if (!(outerID in this.openedWindows)) {
       this.openedWindows[outerID] = this.currentTest;
     }
     this.openedWindows[innerID] = this.currentTest;
 
-    let url = aWindow.location.href || "about:blank";
+    let url = location || "about:blank";
     this.openedURLs[outerID] = this.openedURLs[innerID] = url;
   },
 
@@ -676,9 +672,7 @@ Tester.prototype = {
           // and thus get rid of more false leaks like already terminated workers.
           Services.obs.notifyObservers(null, "memory-pressure", "heap-minimize");
 
-          let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-                       .getService(Ci.nsIMessageBroadcaster);
-          ppmm.broadcastAsyncMessage("browser-test:collect-request");
+          Services.ppmm.broadcastAsyncMessage("browser-test:collect-request");
 
           checkForLeakedGlobalWindows(aResults => {
             if (aResults.length == 0) {
diff --git a/testing/mochitest/document-observer-script.js b/testing/mochitest/document-observer-script.js
new file mode 100644
index 000000000000..55e20aca3b33
--- /dev/null
+++ b/testing/mochitest/document-observer-script.js
@@ -0,0 +1,30 @@
+/* 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 { interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+let observer = {
+  observe(aWindow) {
+    let utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIDOMWindowUtils);
+    let outerID = utils.outerWindowID;
+    let innerID = utils.currentInnerWindowID;
+
+    // NB: We don't have to distinguish between whether this is for a chrome
+    // or content document.
+    sendAsyncMessage("browser-test:documentCreated",
+                     { location: aWindow.location.href,
+                       outerID, innerID });
+  },
+};
+
+addMessageListener("browser-test:removeObservers", (msg) => {
+  Services.obs.removeObserver(observer, "chrome-document-global-created");
+  Services.obs.removeObserver(observer, "content-document-global-created");
+});
+
+Services.obs.addObserver(observer, "chrome-document-global-created", false);
+Services.obs.addObserver(observer, "content-document-global-created", false);
diff --git a/testing/mochitest/jar.mn b/testing/mochitest/jar.mn
index 99edbc002251..821d473b0b26 100644
--- a/testing/mochitest/jar.mn
+++ b/testing/mochitest/jar.mn
@@ -12,6 +12,7 @@ mochikit.jar:
   content/mochitest-e10s-utils.js (mochitest-e10s-utils.js)
   content/shutdown-leaks-collector.js (shutdown-leaks-collector.js)
   content/ShutdownLeaksCollector.jsm (ShutdownLeaksCollector.jsm)
+  content/document-observer-script.js (document-observer-script.js)
   content/harness.xul (harness.xul)
   content/redirect.html (redirect.html)
   content/server.js (server.js)

From 98dc405cb88b8b66a5f733bf3e46e02777fea606 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 16:58:08 -0700
Subject: [PATCH 05/57] Bug 1304531 - Remove CPOW usage from
 browser_bug655273.js. r=Felipe

MozReview-Commit-ID: G27FHSB1SxF

--HG--
extra : rebase_source : ff36435f10832a7dfde60b8f1fb11b92e3dfc4cd
---
 docshell/test/browser/browser_bug655273.js | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/docshell/test/browser/browser_bug655273.js b/docshell/test/browser/browser_bug655273.js
index a86671c0281c..3acb6ddd5552 100644
--- a/docshell/test/browser/browser_bug655273.js
+++ b/docshell/test/browser/browser_bug655273.js
@@ -8,26 +8,23 @@
  * SHEntry.
  **/
 
-function test() {
+add_task(function* test() {
   waitForExplicitFinish();
 
-  let tab = gBrowser.addTab('http://example.com');
-  let tabBrowser = tab.linkedBrowser;
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "http://example.com" },
+    function* (browser) {
+      yield ContentTask.spawn(browser, null, function* () {
+        let cw = content;
+        let oldTitle = cw.document.title;
+        ok(oldTitle, 'Content window should initially have a title.');
+        cw.history.pushState('', '', 'new_page');
 
-  BrowserTestUtils.browserLoaded(tab.linkedBrowser).then(() => {
-    let cw = tabBrowser.contentWindow;
-    let oldTitle = cw.document.title;
-    ok(oldTitle, 'Content window should initially have a title.');
-    cw.history.pushState('', '', 'new_page');
+        let shistory = cw.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIWebNavigation)
+                         .sessionHistory;
 
-    let shistory = cw.QueryInterface(Ci.nsIInterfaceRequestor)
-                     .getInterface(Ci.nsIWebNavigation)
-                     .sessionHistory;
-
-    is(shistory.getEntryAtIndex(shistory.index, false).title,
-       oldTitle, 'SHEntry title after pushstate.');
-
-    gBrowser.removeTab(tab);
-    finish();
-  });
-}
+        is(shistory.getEntryAtIndex(shistory.index, false).title,
+           oldTitle, 'SHEntry title after pushstate.');
+      });
+    });
+});

From 7afea958da144b33a82a4af0168380888838437d Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 17:07:39 -0700
Subject: [PATCH 06/57] Bug 1304531 - Remove CPOW usage from
 browser_timelineMarkers-01.js. r=Felipe

MozReview-Commit-ID: Ec3py9hntta

--HG--
extra : rebase_source : a2e505f9297eede9495672bfe27943b7ca768622
---
 .../browser/browser_timelineMarkers-01.js     | 60 +++++++------------
 1 file changed, 21 insertions(+), 39 deletions(-)

diff --git a/docshell/test/browser/browser_timelineMarkers-01.js b/docshell/test/browser/browser_timelineMarkers-01.js
index 9804b1e442b1..59eeb57dbd59 100644
--- a/docshell/test/browser/browser_timelineMarkers-01.js
+++ b/docshell/test/browser/browser_timelineMarkers-01.js
@@ -5,46 +5,28 @@
 
 // Test that the docShell has the right profile timeline API
 
-var test = Task.async(function*() {
-  waitForExplicitFinish();
+const URL = "data:text/html;charset=utf-8,Test page";
 
-  yield openUrl("data:text/html;charset=utf-8,Test page");
+add_task(function* () {
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: URL },
+    function* (browser) {
+      yield ContentTask.spawn(browser, null, function() {
+        ok("recordProfileTimelineMarkers" in docShell,
+           "The recordProfileTimelineMarkers attribute exists");
+        ok("popProfileTimelineMarkers" in docShell,
+           "The popProfileTimelineMarkers function exists");
+        ok(docShell.recordProfileTimelineMarkers === false,
+           "recordProfileTimelineMarkers is false by default");
+        ok(docShell.popProfileTimelineMarkers().length === 0,
+           "There are no markers by default");
 
-  let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor)
-                        .getInterface(Ci.nsIWebNavigation)
-                        .QueryInterface(Ci.nsIDocShell);
+        docShell.recordProfileTimelineMarkers = true;
+        ok(docShell.recordProfileTimelineMarkers === true,
+           "recordProfileTimelineMarkers can be set to true");
 
-  ok("recordProfileTimelineMarkers" in docShell,
-    "The recordProfileTimelineMarkers attribute exists");
-  ok("popProfileTimelineMarkers" in docShell,
-    "The popProfileTimelineMarkers function exists");
-  ok(docShell.recordProfileTimelineMarkers === false,
-    "recordProfileTimelineMarkers is false by default");
-  ok(docShell.popProfileTimelineMarkers().length === 0,
-    "There are no markers by default");
-
-  docShell.recordProfileTimelineMarkers = true;
-  ok(docShell.recordProfileTimelineMarkers === true,
-    "recordProfileTimelineMarkers can be set to true");
-
-  docShell.recordProfileTimelineMarkers = false;
-  ok(docShell.recordProfileTimelineMarkers === false,
-    "recordProfileTimelineMarkers can be set to false");
-
-  gBrowser.removeCurrentTab();
-  finish();
+        docShell.recordProfileTimelineMarkers = false;
+        ok(docShell.recordProfileTimelineMarkers === false,
+           "recordProfileTimelineMarkers can be set to false");
+      });
+    });
 });
-
-function openUrl(url) {
-  return new Promise(function(resolve, reject) {
-    window.focus();
-
-    let tab = window.gBrowser.selectedTab = window.gBrowser.addTab(url);
-    let linkedBrowser = tab.linkedBrowser;
-
-    linkedBrowser.addEventListener("load", function onload() {
-      linkedBrowser.removeEventListener("load", onload, true);
-      resolve(tab);
-    }, true);
-  });
-}

From fb560b422034a2eaf4efb00151b17b5a48c26676 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 17:19:34 -0700
Subject: [PATCH 07/57] Bug 1304531 - Remove CPOW usage from
 browser_ua_emulation.js. r=Felipe

MozReview-Commit-ID: 4RnoWuVogCT

--HG--
extra : rebase_source : d096117b65edf49a51d4fa6230cf8d61b6852b83
---
 docshell/test/browser/browser_ua_emulation.js | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/docshell/test/browser/browser_ua_emulation.js b/docshell/test/browser/browser_ua_emulation.js
index db46944532bb..94a602d4b2e8 100644
--- a/docshell/test/browser/browser_ua_emulation.js
+++ b/docshell/test/browser/browser_ua_emulation.js
@@ -3,13 +3,11 @@
 
 "use strict";
 
-// Test that the docShell UA emulation works
-add_task(function*() {
-  yield openUrl("data:text/html;charset=utf-8,<iframe id='test-iframe'></iframe>");
+const URL = "data:text/html;charset=utf-8,<iframe id='test-iframe'></iframe>";
 
-  let docshell = content.QueryInterface(Ci.nsIInterfaceRequestor)
-                        .getInterface(Ci.nsIWebNavigation)
-                        .QueryInterface(Ci.nsIDocShell);
+// Test that the docShell UA emulation works
+function* contentTask() {
+  let docshell = docShell;
   is(docshell.customUserAgent, "", "There should initially be no customUserAgent");
 
   docshell.customUserAgent = "foo";
@@ -25,28 +23,14 @@ add_task(function*() {
   is(newFrameWin.navigator.userAgent, "foo", "Newly created frames should use the new UA");
 
   newFrameWin.location.reload();
-  yield waitForEvent(newFrameWin, "load");
+  yield ContentTaskUtils.waitForEvent(newFrameWin, "load");
 
   is(newFrameWin.navigator.userAgent, "foo", "New UA should persist across reloads");
-  gBrowser.removeCurrentTab();
+}
+
+add_task(function* () {
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: URL },
+    function* (browser) {
+      yield ContentTask.spawn(browser, null, contentTask);
+    });
 });
-
-function waitForEvent(target, event) {
-  return new Promise(function(resolve) {
-    target.addEventListener(event, resolve);
-  });
-}
-
-function openUrl(url) {
-  return new Promise(function(resolve, reject) {
-    window.focus();
-
-    let tab = window.gBrowser.selectedTab = window.gBrowser.addTab(url);
-    let linkedBrowser = tab.linkedBrowser;
-
-    linkedBrowser.addEventListener("load", function onload() {
-      linkedBrowser.removeEventListener("load", onload, true);
-      resolve(tab);
-    }, true);
-  });
-}

From 34e6eff4f8926d9b33c4d8d8ae2ca9444c844c4f Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 18:04:15 -0700
Subject: [PATCH 08/57] Bug 1304531 - Remove CPOW usage from
 browser_ConsoleStorageAPITests.js. r=Felipe

This was a little tricky to get right. The "spin the event loop" bit is weird
but doing a setTimout to call resolve is already redundant since resolve calls
the promise callbacks on the next turn of the event loop anyway. Basically,
the test just needed to move more stuff to the content process.

MozReview-Commit-ID: KrZZU5reJf7

--HG--
extra : rebase_source : 0817cdefc2e3941a5f59e3e8365d72395d8c4869
---
 .../browser/browser_ConsoleStorageAPITests.js | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/dom/tests/browser/browser_ConsoleStorageAPITests.js b/dom/tests/browser/browser_ConsoleStorageAPITests.js
index 1b69da9ce7c4..742f6f877c3e 100644
--- a/dom/tests/browser/browser_ConsoleStorageAPITests.js
+++ b/dom/tests/browser/browser_ConsoleStorageAPITests.js
@@ -12,10 +12,7 @@ function tearDown()
 add_task(function*()
 {
   // Don't cache removed tabs, so "clear console cache on tab close" triggers.
-  Services.prefs.setIntPref("browser.tabs.max_tabs_undo", 0);
-  registerCleanupFunction(function() {
-    Services.prefs.clearUserPref("browser.tabs.max_tabs_undo");
-  });
+  yield SpecialPowers.pushPrefEnv({ set: [[ "browser.tabs.max_tabs_undo", 0 ]] });
 
   registerCleanupFunction(tearDown);
 
@@ -28,12 +25,12 @@ add_task(function*()
   gBrowser.selectedTab = tab;
   var browser = gBrowser.selectedBrowser;
 
-  let observerPromise = ContentTask.spawn(browser, null, function(opt) {
+  let observerPromise = ContentTask.spawn(browser, null, function* (opt) {
     const TEST_URI = "http://example.com/browser/dom/tests/browser/test-console-api.html";
     let ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
           .getService(Ci.nsIConsoleAPIStorage);
 
-    return new Promise(resolve => {
+    let observerPromise = new Promise(resolve => {
       let apiCallCount = 0;
       let ConsoleObserver = {
         QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
@@ -46,9 +43,9 @@ add_task(function*()
                     .getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
 
               Services.obs.removeObserver(this, "console-storage-cache-event");
-              Assert.ok(ConsoleAPIStorage.getEvents(windowId).length >= 4, "Some messages found in the storage service");
+              ok(ConsoleAPIStorage.getEvents(windowId).length >= 4, "Some messages found in the storage service");
               ConsoleAPIStorage.clearEvents();
-              Assert.equal(ConsoleAPIStorage.getEvents(windowId).length, 0, "Cleared Storage");
+              is(ConsoleAPIStorage.getEvents(windowId).length, 0, "Cleared Storage");
 
               resolve(windowId);
             }
@@ -61,24 +58,23 @@ add_task(function*()
       // Redirect the browser to the test URI
       content.window.location = TEST_URI;
     });
+
+    yield ContentTaskUtils.waitForEvent(this, "DOMContentLoaded");
+
+    content.console.log("this", "is", "a", "log message");
+    content.console.info("this", "is", "a", "info message");
+    content.console.warn("this", "is", "a", "warn message");
+    content.console.error("this", "is", "a", "error message");
+    return observerPromise;
   });
 
-  let win;
-  browser.addEventListener("DOMContentLoaded", function onLoad(event) {
-    browser.removeEventListener("DOMContentLoaded", onLoad, false);
-    executeSoon(function test_executeSoon() {
-      win = browser.contentWindow;
-      win.console.log("this", "is", "a", "log message");
-      win.console.info("this", "is", "a", "info message");
-      win.console.warn("this", "is", "a", "warn message");
-      win.console.error("this", "is", "a", "error message");
-    });
-  }, false);
-
   let windowId = yield observerPromise;
-  // make sure a closed window's events are in fact removed from
-  // the storage cache
-  win.console.log("adding a new event");
+
+  yield ContentTask.spawn(browser, null, function() {
+    // make sure a closed window's events are in fact removed from
+    // the storage cache
+    content.console.log("adding a new event");
+  });
 
   // Close the window.
   gBrowser.removeTab(tab, {animate: false});
@@ -89,16 +85,14 @@ add_task(function*()
   gBrowser.selectedTab = keepaliveTab;
   browser = gBrowser.selectedBrowser;
 
-  // Ensure the "inner-window-destroyed" event is processed,
-  // so the storage cache is cleared. We do this in the content
-  // process because that is where the event will be processed.
-  yield ContentTask.spawn(browser, null, function() {
-    yield new Promise(resolve => setTimeout(resolve, 0));
+  // Spin the event loop to make sure everything is cleared.
+  yield ContentTask.spawn(browser, null, function () {
+    return Promise.resolve();
   });
 
   yield ContentTask.spawn(browser, windowId, function(windowId) {
     var ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
           .getService(Ci.nsIConsoleAPIStorage);
-    Assert.equal(ConsoleAPIStorage.getEvents(windowId).length, 0, "tab close is clearing the cache");
+    is(ConsoleAPIStorage.getEvents(windowId).length, 0, "tab close is clearing the cache");
   });
 });

From 79d33d6c32fcf672c6cbe954fbd9c7f73f6220fe Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 18:37:35 -0700
Subject: [PATCH 09/57] Bug 1304531 - Remove CPOW usage from
 browser_WebRequest.js. r=Felipe

MozReview-Commit-ID: 2m4H9KT3dos

--HG--
extra : rebase_source : 7fcde08d83b565fd04dee1f0cb03f7facb41e12a
---
 .../tests/browser/browser_WebRequest.js       | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/toolkit/modules/tests/browser/browser_WebRequest.js b/toolkit/modules/tests/browser/browser_WebRequest.js
index 0d3012e2bef8..cdb28b16cd3a 100644
--- a/toolkit/modules/tests/browser/browser_WebRequest.js
+++ b/toolkit/modules/tests/browser/browser_WebRequest.js
@@ -179,26 +179,24 @@ function* test_once()
   WebRequest.onBeforeRedirect.addListener(onBeforeRedirect);
   WebRequest.onResponseStarted.addListener(onResponseStarted);
 
-  gBrowser.selectedTab = gBrowser.addTab();
-  let browser = gBrowser.selectedBrowser;
-  expected_browser = browser;
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" },
+    function* (browser) {
+      expected_browser = browser;
+      BrowserTestUtils.loadURI(browser, URL);
+      yield BrowserTestUtils.browserLoaded(expected_browser);
 
-  yield BrowserTestUtils.browserLoaded(expected_browser);
+      expected_browser = null;
 
-  browser.messageManager.loadFrameScript(`data:,content.location = "${URL}";`, false);
+      yield ContentTask.spawn(browser, null, function() {
+        let win = content.wrappedJSObject;
+        is(win.success, 2, "Good script ran");
+        is(win.failure, undefined, "Failure script didn't run");
 
-  yield BrowserTestUtils.browserLoaded(expected_browser);
-
-  expected_browser = null;
-
-  let win = browser.contentWindow.wrappedJSObject;
-  is(win.success, 2, "Good script ran");
-  is(win.failure, undefined, "Failure script didn't run");
-
-  let style = browser.contentWindow.getComputedStyle(browser.contentDocument.getElementById("test"), null);
-  is(style.getPropertyValue("color"), "rgb(255, 0, 0)", "Good CSS loaded");
-
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+        let style =
+          content.getComputedStyle(content.document.getElementById("test"), null);
+        is(style.getPropertyValue("color"), "rgb(255, 0, 0)", "Good CSS loaded");
+      });
+    });
 
   compareLists(requested, expected_requested, "requested");
   compareLists(sendHeaders, expected_sendHeaders, "sendHeaders");

From 06aa76e9a89717eff6e6fcfd35a7653a6e7811a2 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 18:54:03 -0700
Subject: [PATCH 10/57] Bug 1304531 - Remove CPOW usage in
 browser_web_protocol_handlers.js. r=Felipe

This one isn't intermittent but I noticed it in the logs and it was free to
fix.

MozReview-Commit-ID: D56wiHn3IfL

--HG--
extra : rebase_source : d8078fc995249d39d6c0e838d394f1465a9a3684
---
 .../exthandler/tests/mochitest/browser_web_protocol_handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js b/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
index a299d7b6eb9a..ac3e66258875 100644
--- a/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
+++ b/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
@@ -38,7 +38,7 @@ add_task(function*() {
   handlerSvc.store(protoInfo);
 
   // Middle-click a testprotocol link and check the new tab is correct
-  let link = browser.contentDocument.getElementById("link");
+  let link = "#link";
   const expectedURL = "https://example.com/foobar?uri=testprotocol%3Atest";
 
   let promiseTabOpened =

From d9db0936c629c39576312164359e79f3d352c9d0 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 20 Sep 2016 18:59:42 -0700
Subject: [PATCH 11/57] Bug 1304531 - Remove CPOW usage from
 browser_newtabwebchannel.js. r=Felipe

This one also probably wouldn't cause problems, but getting rid of the CPOW
was so easy, I did so anyway.

MozReview-Commit-ID: IWNwpKF52gI

--HG--
extra : rebase_source : 909cf7fb351f9a7d27e806616e48592f169dae12
---
 .../components/newtab/tests/browser/browser_newtabwebchannel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/newtab/tests/browser/browser_newtabwebchannel.js b/browser/components/newtab/tests/browser/browser_newtabwebchannel.js
index 2a78fd2660b0..f003b105b227 100644
--- a/browser/components/newtab/tests/browser/browser_newtabwebchannel.js
+++ b/browser/components/newtab/tests/browser/browser_newtabwebchannel.js
@@ -241,7 +241,7 @@ add_task(function* open_webchannel_reload() {
     is(NewTabWebChannel.numBrowsers, 1, "One target expected");
     is(target.browser, browser, "Same browser");
 
-    browser.contentWindow.location.reload();
+    browser.reload();
   });
 
   Cu.forceGC();

From 0ae8e3bde6bfdd9567917e9fd18de5eaca8af9ac Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Fri, 30 Sep 2016 16:18:00 -0700
Subject: [PATCH 12/57] Bug 1304531 - Remove this test as it no longer tests
 anything we care about and uses shims. r=Felipe,mconley

MozReview-Commit-ID: 70VFR34Kr7Y

--HG--
extra : rebase_source : e6bfad997c8a4cb85c91a43e5942565da524311a
---
 browser/base/content/test/general/browser.ini |  1 -
 .../content/test/general/browser_bug880101.js | 50 -------------------
 2 files changed, 51 deletions(-)
 delete mode 100644 browser/base/content/test/general/browser_bug880101.js

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 70a1072e31b0..c7a6903db650 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -268,7 +268,6 @@ skip-if = (os == 'linux' && e10s) # bug 1277750
 tags = mcb
 [browser_bug832435.js]
 [browser_bug839103.js]
-[browser_bug880101.js]
 [browser_bug882977.js]
 [browser_bug902156.js]
 tags = mcb
diff --git a/browser/base/content/test/general/browser_bug880101.js b/browser/base/content/test/general/browser_bug880101.js
deleted file mode 100644
index bcc976f2fa31..000000000000
--- a/browser/base/content/test/general/browser_bug880101.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const URL = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
-
-function test() {
-  let win;
-
-  let listener = {
-    onLocationChange: (webProgress, request, uri, flags) => {
-      ok(webProgress.isTopLevel, "Received onLocationChange from top frame");
-      is(uri.spec, URL, "Received onLocationChange for correct URL");
-      finish();
-    }
-  };
-
-  waitForExplicitFinish();
-
-  // Remove the listener and window when we're done.
-  registerCleanupFunction(() => {
-    win.gBrowser.removeProgressListener(listener);
-    win.close();
-  });
-
-  // Wait for the newly opened window.
-  whenNewWindowOpened(w => win = w);
-
-  // Open a link in a new window.
-  openLinkIn(URL, "window", {});
-
-  // On the next tick, but before the window has finished loading, access the
-  // window's gBrowser property to force the tabbrowser constructor early.
-  (function tryAddProgressListener() {
-    executeSoon(() => {
-      try {
-        win.gBrowser.addProgressListener(listener);
-      } catch (e) {
-        // win.gBrowser wasn't ready, yet. Try again in a tick.
-        tryAddProgressListener();
-      }
-    });
-  })();
-}
-
-function whenNewWindowOpened(cb) {
-  Services.obs.addObserver(function obs(win) {
-    Services.obs.removeObserver(obs, "domwindowopened");
-    cb(win);
-  }, "domwindowopened", false);
-}

From 5c6c77e01e2096b5f001c68191d46a646d55f984 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 27 Sep 2016 15:35:39 -0400
Subject: [PATCH 13/57] Bug 1305819 - set SSSE3_FLAGS for x86-64 Windows
 clang-cl builds; r=glandium

64-bit Windows builds that use clang-cl need -mssse3 specified, just
like the 32-bit builds.

MozReview-Commit-ID: KAYXYAAw46I

--HG--
extra : rebase_source : c882da5408c6e081b9564c859e73eccc5671287b
---
 old-configure.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/old-configure.in b/old-configure.in
index b6c20efcc42d..3b357fa9277f 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1085,10 +1085,11 @@ case "$target" in
             dnl MSVC allows the use of intrinsics without any flags
             dnl and doesn't have a separate arch for SSSE3
             SSSE3_FLAGS="-arch:SSE2"
-            dnl clang-cl, however, requires the appropriate flags.
-            if test -n "$CLANG_CL"; then
-                SSSE3_FLAGS="-mssse3"
-            fi
+        fi
+        dnl clang-cl requires appropriate flags to enable SSSE3 support
+        dnl on all architectures.
+        if test -n "$CLANG_CL"; then
+            SSSE3_FLAGS="-mssse3"
         fi
         dnl VS2013+ requires -FS when parallel building by make -jN.
         dnl If nothing, compiler sometimes causes C1041 error.

From 0d19e3e8e0dc1026dadc125418f8ddd87df5634c Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Thu, 29 Sep 2016 16:11:52 +1000
Subject: [PATCH 14/57] Bug 1306212 part 1 - Make StyleSheetInfo a member of
 ServoStyleSheet. r=heycam

MozReview-Commit-ID: 1gAu507RLfE

--HG--
extra : rebase_source : 2fd5621845c42ab98056bb04f51b0b216b4bfe79
---
 layout/style/ServoStyleSheet.cpp | 2 +-
 layout/style/ServoStyleSheet.h   | 4 +++-
 layout/style/StyleSheetInfo.h    | 2 +-
 layout/style/StyleSheetInlines.h | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/layout/style/ServoStyleSheet.cpp b/layout/style/ServoStyleSheet.cpp
index bbac08d0b3fd..775a13ad7814 100644
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -14,7 +14,7 @@ ServoStyleSheet::ServoStyleSheet(css::SheetParsingMode aParsingMode,
                                  net::ReferrerPolicy aReferrerPolicy,
                                  const dom::SRIMetadata& aIntegrity)
   : StyleSheet(StyleBackendType::Servo, aParsingMode)
-  , StyleSheetInfo(aCORSMode, aReferrerPolicy, aIntegrity)
+  , mSheetInfo(aCORSMode, aReferrerPolicy, aIntegrity)
 {
 }
 
diff --git a/layout/style/ServoStyleSheet.h b/layout/style/ServoStyleSheet.h
index 21c8151ae8ed..44261d277d56 100644
--- a/layout/style/ServoStyleSheet.h
+++ b/layout/style/ServoStyleSheet.h
@@ -20,7 +20,6 @@ namespace mozilla {
  * CSS style sheet object that is a wrapper for a Servo Stylesheet.
  */
 class ServoStyleSheet : public StyleSheet
-                      , public StyleSheetInfo
 {
 public:
   ServoStyleSheet(css::SheetParsingMode aParsingMode,
@@ -58,6 +57,9 @@ private:
   void DropSheet();
 
   RefPtr<RawServoStyleSheet> mSheet;
+  StyleSheetInfo mSheetInfo;
+
+  friend class StyleSheet;
 };
 
 } // namespace mozilla
diff --git a/layout/style/StyleSheetInfo.h b/layout/style/StyleSheetInfo.h
index 2f4c9a55c224..011a67152acd 100644
--- a/layout/style/StyleSheetInfo.h
+++ b/layout/style/StyleSheetInfo.h
@@ -22,7 +22,7 @@ class nsIPrincipal;
 namespace mozilla {
 
 /**
- * Superclass for data common to CSSStyleSheetInner and ServoStyleSheet.
+ * Struct for data common to CSSStyleSheetInner and ServoStyleSheet.
  */
 class StyleSheetInfo
 {
diff --git a/layout/style/StyleSheetInlines.h b/layout/style/StyleSheetInlines.h
index 837b18f705ce..22b6baa42db2 100644
--- a/layout/style/StyleSheetInlines.h
+++ b/layout/style/StyleSheetInlines.h
@@ -46,7 +46,7 @@ StyleSheetInfo&
 StyleSheet::SheetInfo()
 {
   if (IsServo()) {
-    return *AsServo();
+    return AsServo()->mSheetInfo;
   }
   return *AsGecko()->mInner;
 }
@@ -55,7 +55,7 @@ const StyleSheetInfo&
 StyleSheet::SheetInfo() const
 {
   if (IsServo()) {
-    return *AsServo();
+    return AsServo()->mSheetInfo;
   }
   return *AsGecko()->mInner;
 }

From 3202d476c0b2b7f5c02f0ca3471acdb65b6730b7 Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Thu, 29 Sep 2016 16:17:58 +1000
Subject: [PATCH 15/57] Bug 1306212 part 2 - Remove visibility restriction of
 StyleSheetInfo. r=heycam

MozReview-Commit-ID: 8xAkfwtDpRu

--HG--
extra : rebase_source : c09503f93909ed44a873162638af36ef5ba1452b
---
 layout/style/CSSStyleSheet.h  | 7 +------
 layout/style/StyleSheet.h     | 2 +-
 layout/style/StyleSheetInfo.h | 8 +-------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/layout/style/CSSStyleSheet.h b/layout/style/CSSStyleSheet.h
index 0707c31c0f32..772ba117af5d 100644
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -57,13 +57,8 @@ class CSSRuleList;
 // CSS Style Sheet Inner Data Container
 //
 
-class CSSStyleSheetInner : public StyleSheetInfo
+struct CSSStyleSheetInner : public StyleSheetInfo
 {
-public:
-  friend class mozilla::CSSStyleSheet;
-  friend class ::nsCSSRuleProcessor;
-
-private:
   CSSStyleSheetInner(CSSStyleSheet* aPrimarySheet,
                      CORSMode aCORSMode,
                      ReferrerPolicy aReferrerPolicy,
diff --git a/layout/style/StyleSheet.h b/layout/style/StyleSheet.h
index d82bf3c233a8..702e3b14a837 100644
--- a/layout/style/StyleSheet.h
+++ b/layout/style/StyleSheet.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 class CSSStyleSheet;
 class ServoStyleSheet;
-class StyleSheetInfo;
+struct StyleSheetInfo;
 
 namespace dom {
 class SRIMetadata;
diff --git a/layout/style/StyleSheetInfo.h b/layout/style/StyleSheetInfo.h
index 011a67152acd..353ea048530c 100644
--- a/layout/style/StyleSheetInfo.h
+++ b/layout/style/StyleSheetInfo.h
@@ -24,11 +24,8 @@ namespace mozilla {
 /**
  * Struct for data common to CSSStyleSheetInner and ServoStyleSheet.
  */
-class StyleSheetInfo
+struct StyleSheetInfo
 {
-public:
-  friend class mozilla::CSSStyleSheet;
-  friend class ::nsCSSRuleProcessor;
   typedef net::ReferrerPolicy ReferrerPolicy;
 
   StyleSheetInfo(CORSMode aCORSMode,
@@ -36,7 +33,6 @@ public:
                  const dom::SRIMetadata& aIntegrity);
   StyleSheetInfo(const StyleSheetInfo& aCopy);
 
-protected:
   nsCOMPtr<nsIURI>       mSheetURI; // for error reports, etc.
   nsCOMPtr<nsIURI>       mOriginalSheetURI;  // for GetHref.  Can be null.
   nsCOMPtr<nsIURI>       mBaseURI; // for resolving relative URIs
@@ -50,8 +46,6 @@ protected:
 #ifdef DEBUG
   bool                   mPrincipalSet;
 #endif
-
-  friend class StyleSheet;
 };
 
 } // namespace mozilla

From b1c50539b1382bfaa081851fdaf0392d9df6283a Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Thu, 29 Sep 2016 16:19:06 +1000
Subject: [PATCH 16/57] Bug 1306212 part 3 - Move the only constructor of
 StyleSheetInfo to StyleSheet.cpp. r=heycam

MozReview-Commit-ID: Fv2AyBE1Js0

--HG--
extra : rebase_source : 577f265aab22cc69e3adbb9836939373359064f1
---
 layout/style/StyleSheet.cpp     | 19 +++++++++++++
 layout/style/StyleSheetInfo.cpp | 48 ---------------------------------
 layout/style/StyleSheetInfo.h   |  1 -
 layout/style/moz.build          |  1 -
 4 files changed, 19 insertions(+), 50 deletions(-)
 delete mode 100644 layout/style/StyleSheetInfo.cpp

diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp
index 8ab0d94c1b9d..c7ad73a344ab 100644
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -11,6 +11,8 @@
 #include "mozilla/StyleSheetInlines.h"
 #include "mozilla/CSSStyleSheet.h"
 
+#include "nsNullPrincipal.h"
+
 namespace mozilla {
 
 StyleSheet::StyleSheet(StyleBackendType aType, css::SheetParsingMode aParsingMode)
@@ -76,4 +78,21 @@ StyleSheet::SetComplete()
   }
 }
 
+StyleSheetInfo::StyleSheetInfo(CORSMode aCORSMode,
+                               ReferrerPolicy aReferrerPolicy,
+                               const dom::SRIMetadata& aIntegrity)
+  : mPrincipal(nsNullPrincipal::Create())
+  , mCORSMode(aCORSMode)
+  , mReferrerPolicy(aReferrerPolicy)
+  , mIntegrity(aIntegrity)
+  , mComplete(false)
+#ifdef DEBUG
+  , mPrincipalSet(false)
+#endif
+{
+  if (!mPrincipal) {
+    NS_RUNTIMEABORT("nsNullPrincipal::Init failed");
+  }
+}
+
 } // namespace mozilla
diff --git a/layout/style/StyleSheetInfo.cpp b/layout/style/StyleSheetInfo.cpp
deleted file mode 100644
index c4b8893e84ff..000000000000
--- a/layout/style/StyleSheetInfo.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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/. */
-
-#include "StyleSheetInfo.h"
-
-#include "nsIURI.h"
-#include "nsNullPrincipal.h"
-
-namespace mozilla {
-
-using namespace mozilla::dom;
-
-StyleSheetInfo::StyleSheetInfo(CORSMode aCORSMode,
-                               ReferrerPolicy aReferrerPolicy,
-                               const SRIMetadata& aIntegrity)
-  : mPrincipal(nsNullPrincipal::Create())
-  , mCORSMode(aCORSMode)
-  , mReferrerPolicy(aReferrerPolicy)
-  , mIntegrity(aIntegrity)
-  , mComplete(false)
-#ifdef DEBUG
-  , mPrincipalSet(false)
-#endif
-{
-  if (!mPrincipal) {
-    NS_RUNTIMEABORT("nsNullPrincipal::Init failed");
-  }
-}
-
-StyleSheetInfo::StyleSheetInfo(const StyleSheetInfo& aCopy)
-  : mSheetURI(aCopy.mSheetURI)
-  , mOriginalSheetURI(aCopy.mOriginalSheetURI)
-  , mBaseURI(aCopy.mBaseURI)
-  , mPrincipal(aCopy.mPrincipal)
-  , mCORSMode(aCopy.mCORSMode)
-  , mReferrerPolicy(aCopy.mReferrerPolicy)
-  , mIntegrity(aCopy.mIntegrity)
-  , mComplete(aCopy.mComplete)
-#ifdef DEBUG
-  , mPrincipalSet(aCopy.mPrincipalSet)
-#endif
-{
-}
-
-} // namespace mozilla
diff --git a/layout/style/StyleSheetInfo.h b/layout/style/StyleSheetInfo.h
index 353ea048530c..9d085fa81511 100644
--- a/layout/style/StyleSheetInfo.h
+++ b/layout/style/StyleSheetInfo.h
@@ -31,7 +31,6 @@ struct StyleSheetInfo
   StyleSheetInfo(CORSMode aCORSMode,
                  ReferrerPolicy aReferrerPolicy,
                  const dom::SRIMetadata& aIntegrity);
-  StyleSheetInfo(const StyleSheetInfo& aCopy);
 
   nsCOMPtr<nsIURI>       mSheetURI; // for error reports, etc.
   nsCOMPtr<nsIURI>       mOriginalSheetURI;  // for GetHref.  Can be null.
diff --git a/layout/style/moz.build b/layout/style/moz.build
index e5f1af6dea8a..c44de828342c 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -198,7 +198,6 @@ UNIFIED_SOURCES += [
     'StyleAnimationValue.cpp',
     'StyleRule.cpp',
     'StyleSheet.cpp',
-    'StyleSheetInfo.cpp',
     'SVGAttrAnimationRuleProcessor.cpp',
 ]
 

From 84add39770f85902dba916189a137cb1cd973648 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 27 Sep 2016 17:42:12 +1000
Subject: [PATCH 17/57] Bug 1305645 - have the FxaPushService log information
 about push messages received. r=kitcambridge

MozReview-Commit-ID: Jx21Jj92eu4

--HG--
extra : rebase_source : f00c6651650a8980a6b161622f99e0ff0527e881
---
 services/fxaccounts/FxAccountsPush.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/fxaccounts/FxAccountsPush.js b/services/fxaccounts/FxAccountsPush.js
index d6c73f416723..358be06ee393 100644
--- a/services/fxaccounts/FxAccountsPush.js
+++ b/services/fxaccounts/FxAccountsPush.js
@@ -158,9 +158,11 @@ FxAccountsPushService.prototype = {
     this.log.trace("FxAccountsPushService _onPushMessage");
     if (!message.data) {
       // Use the empty signal to check the verification state of the account right away
+      this.log.debug("empty push message - checking account status");
       return this.fxAccounts.checkVerificationStatus();
     }
     let payload = message.data.json();
+    this.log.debug(`push command: ${payload.command}`);
     switch (payload.command) {
       case ON_DEVICE_DISCONNECTED_NOTIFICATION:
         return this.fxAccounts.handleDeviceDisconnection(payload.data.id);

From 3888f9a621fc3ae1ccf798bd3249b03ee0a44d4d Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 15 Sep 2016 22:39:04 -0500
Subject: [PATCH 18/57] Bug 1291714 - sdp changes to support DTMF signaling.
 r=bwc

MozReview-Commit-ID: 7etTBsz3sM5

--HG--
extra : rebase_source : e71f97670677c51b96a477c5cfb95f91a3fdef87
---
 .../signaling/src/jsep/JsepCodecDescription.h |  26 +-
 .../signaling/src/jsep/JsepSessionImpl.cpp    |  12 +
 media/webrtc/signaling/src/jsep/JsepTrack.cpp |  34 +-
 .../signaling/src/media-conduit/CodecConfig.h |   2 +
 .../peerconnection/MediaPipelineFactory.cpp   |   1 +
 .../src/peerconnection/PeerConnectionImpl.cpp |  10 +-
 .../webrtc/signaling/src/sdp/SdpAttribute.cpp |   1 +
 media/webrtc/signaling/src/sdp/SdpAttribute.h |  27 ++
 .../signaling/src/sdp/SdpMediaSection.cpp     |  20 +
 .../signaling/src/sdp/SdpMediaSection.h       |   1 +
 .../src/sdp/SipccSdpAttributeList.cpp         |  11 +-
 media/webrtc/signaling/src/sdp/sipcc/ccsdp.h  |   2 +-
 media/webrtc/signaling/src/sdp/sipcc/sdp.h    |   9 +
 .../signaling/src/sdp/sipcc/sdp_access.c      |   4 +
 .../webrtc/signaling/src/sdp/sipcc/sdp_attr.c |  75 +++-
 .../signaling/test/jsep_session_unittest.cpp  | 182 ++++++++-
 .../signaling/test/jsep_track_unittest.cpp    | 386 +++++++++++++++++-
 media/webrtc/signaling/test/sdp_unittests.cpp | 291 ++++++++++++-
 18 files changed, 1066 insertions(+), 28 deletions(-)

diff --git a/media/webrtc/signaling/src/jsep/JsepCodecDescription.h b/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
index 3bd155d84525..6ae5c93805ae 100644
--- a/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
+++ b/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
@@ -134,7 +134,8 @@ class JsepAudioCodecDescription : public JsepCodecDescription {
         mBitrate(bitRate),
         mMaxPlaybackRate(0),
         mForceMono(false),
-        mFECEnabled(false)
+        mFECEnabled(false),
+        mDtmfEnabled(false)
   {
   }
 
@@ -156,6 +157,23 @@ class JsepAudioCodecDescription : public JsepCodecDescription {
     return result;
   }
 
+  SdpFmtpAttributeList::TelephoneEventParameters
+  GetTelephoneEventParameters(const std::string& pt,
+                              const SdpMediaSection& msection) const
+  {
+    // Will contain defaults if nothing else
+    SdpFmtpAttributeList::TelephoneEventParameters result;
+    auto* params = msection.FindFmtp(pt);
+
+    if (params && params->codec_type == SdpRtpmapAttributeList::kTelephoneEvent) {
+      result =
+        static_cast<const SdpFmtpAttributeList::TelephoneEventParameters&>
+            (*params);
+    }
+
+    return result;
+  }
+
   void
   AddParametersToMSection(SdpMediaSection& msection) const override
   {
@@ -175,6 +193,11 @@ class JsepAudioCodecDescription : public JsepCodecDescription {
       }
       opusParams.useInBandFec = mFECEnabled ? 1 : 0;
       msection.SetFmtp(SdpFmtpAttributeList::Fmtp(mDefaultPt, opusParams));
+    } else if (mName == "telephone-event") {
+      // add the default dtmf tones
+      SdpFmtpAttributeList::TelephoneEventParameters teParams(
+          GetTelephoneEventParameters(mDefaultPt, msection));
+      msection.SetFmtp(SdpFmtpAttributeList::Fmtp(mDefaultPt, teParams));
     }
   }
 
@@ -203,6 +226,7 @@ class JsepAudioCodecDescription : public JsepCodecDescription {
   uint32_t mMaxPlaybackRate;
   bool mForceMono;
   bool mFECEnabled;
+  bool mDtmfEnabled;
 };
 
 class JsepVideoCodecDescription : public JsepCodecDescription {
diff --git a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
index ff731c67bc1f..23f9397eab44 100644
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -2153,6 +2153,18 @@ JsepSessionImpl::SetupDefaultCodecs()
                                     8 * 8000 * 1 // 8 * frequency * channels
                                     ));
 
+  // note: because telephone-event is effectively a marker codec that indicates
+  // that dtmf rtp packets may be passed, the packetSize and bitRate fields
+  // don't make sense here.  For now, use zero. (mjf)
+  mSupportedCodecs.values.push_back(
+      new JsepAudioCodecDescription("101",
+                                    "telephone-event",
+                                    8000,
+                                    1,
+                                    0, // packetSize doesn't make sense here
+                                    0  // bitRate doesn't make sense here
+                                    ));
+
   // Supported video codecs.
   // Note: order here implies priority for building offers!
   JsepVideoCodecDescription* vp8 = new JsepVideoCodecDescription(
diff --git a/media/webrtc/signaling/src/jsep/JsepTrack.cpp b/media/webrtc/signaling/src/jsep/JsepTrack.cpp
index 7133e844c9bd..1b045d8ec7e6 100644
--- a/media/webrtc/signaling/src/jsep/JsepTrack.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepTrack.cpp
@@ -344,9 +344,12 @@ JsepTrack::NegotiateCodecs(
     }
   }
 
-  // Find the (potential) red codec and ulpfec codec
+  // Find the (potential) red codec and ulpfec codec or telephone-event
   JsepVideoCodecDescription* red = nullptr;
   JsepVideoCodecDescription* ulpfec = nullptr;
+  JsepAudioCodecDescription* dtmf = nullptr;
+  // We can safely cast here since JsepTrack has a MediaType and only codecs
+  // that match that MediaType (kAudio or kVideo) are added.
   for (auto codec : *codecs) {
     if (codec->mName == "red") {
       red = static_cast<JsepVideoCodecDescription*>(codec);
@@ -354,6 +357,9 @@ JsepTrack::NegotiateCodecs(
     else if (codec->mName == "ulpfec") {
       ulpfec = static_cast<JsepVideoCodecDescription*>(codec);
     }
+    else if (codec->mName == "telephone-event") {
+      dtmf = static_cast<JsepAudioCodecDescription*>(codec);
+    }
   }
   // if we have a red codec remove redundant encodings that don't exist
   if (red) {
@@ -386,6 +392,18 @@ JsepTrack::NegotiateCodecs(
     }
   }
 
+  // Dtmf support is indicated by the existence of the telephone-event
+  // codec, and not an attribute on the particular audio codec (like in a
+  // rtcpfb attr). If we see the telephone-event codec, we enabled dtmf
+  // support on all the other audio codecs.
+  if (dtmf) {
+    for (auto codec : *codecs) {
+      JsepAudioCodecDescription* audioCodec =
+          static_cast<JsepAudioCodecDescription*>(codec);
+      audioCodec->mDtmfEnabled = true;
+    }
+  }
+
   // Make sure strongly preferred codecs are up front, overriding the remote
   // side's preference.
   std::stable_sort(codecs->begin(), codecs->end(), CompareCodec);
@@ -393,12 +411,20 @@ JsepTrack::NegotiateCodecs(
   // TODO(bug 814227): Remove this once we're ready to put multiple codecs in an
   // answer.  For now, remove all but the first codec unless the red codec
   // exists, and then we include the others per RFC 5109, section 14.2.
+  // Note: now allows keeping the telephone-event codec, if it appears, as the
+  // last codec in the list.
   if (!codecs->empty() && !red) {
+    int newSize = dtmf ? 2 : 1;
     for (size_t i = 1; i < codecs->size(); ++i) {
-      delete (*codecs)[i];
-      (*codecs)[i] = nullptr;
+      if (!dtmf || dtmf != (*codecs)[i]) {
+        delete (*codecs)[i];
+        (*codecs)[i] = nullptr;
+      }
     }
-    codecs->resize(1);
+    if (dtmf) {
+      (*codecs)[newSize-1] = dtmf;
+    }
+    codecs->resize(newSize);
   }
 }
 
diff --git a/media/webrtc/signaling/src/media-conduit/CodecConfig.h b/media/webrtc/signaling/src/media-conduit/CodecConfig.h
index e488cb89655f..308c97948166 100755
--- a/media/webrtc/signaling/src/media-conduit/CodecConfig.h
+++ b/media/webrtc/signaling/src/media-conduit/CodecConfig.h
@@ -30,6 +30,7 @@ struct AudioCodecConfig
   int mRate;
 
   bool mFECEnabled;
+  bool mDtmfEnabled;
 
   // OPUS-specific
   int mMaxPlaybackRate;
@@ -47,6 +48,7 @@ struct AudioCodecConfig
                                                      mChannels(channels),
                                                      mRate(rate),
                                                      mFECEnabled(FECEnabled),
+                                                     mDtmfEnabled(false),
                                                      mMaxPlaybackRate(0)
   {
   }
diff --git a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
index 54b62934540f..d83189407f1d 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -77,6 +77,7 @@ JsepCodecDescToCodecConfig(const JsepCodecDescription& aCodec,
                                   desc.mBitrate,
                                   desc.mFECEnabled);
   (*aConfig)->mMaxPlaybackRate = desc.mMaxPlaybackRate;
+  (*aConfig)->mDtmfEnabled = desc.mDtmfEnabled;
 
   return NS_OK;
 }
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index 642b89412712..59cb9b3a18ce 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -896,7 +896,8 @@ class ConfigureCodec {
       mUseTmmbr(false),
       mUseRemb(false),
       mUseAudioFec(false),
-      mRedUlpfecEnabled(false)
+      mRedUlpfecEnabled(false),
+      mDtmfEnabled(false)
     {
 #ifdef MOZ_WEBRTC_OMX
       // Check to see if what HW codecs are available (not in use) at this moment.
@@ -970,6 +971,10 @@ class ConfigureCodec {
 
       branch->GetBoolPref("media.navigator.video.red_ulpfec_enabled",
                           &mRedUlpfecEnabled);
+
+      // media.peerconnection.dtmf.enabled controls both sdp generation for
+      // DTMF support as well as DTMF exposure to DOM
+      branch->GetBoolPref("media.peerconnection.dtmf.enabled", &mDtmfEnabled);
     }
 
     void operator()(JsepCodecDescription* codec) const
@@ -981,6 +986,8 @@ class ConfigureCodec {
               static_cast<JsepAudioCodecDescription&>(*codec);
             if (audioCodec.mName == "opus") {
               audioCodec.mFECEnabled = mUseAudioFec;
+            } else if (audioCodec.mName == "telephone-event") {
+              audioCodec.mEnabled = mDtmfEnabled;
             }
           }
           break;
@@ -1053,6 +1060,7 @@ class ConfigureCodec {
     bool mUseRemb;
     bool mUseAudioFec;
     bool mRedUlpfecEnabled;
+    bool mDtmfEnabled;
 };
 
 class ConfigureRedCodec {
diff --git a/media/webrtc/signaling/src/sdp/SdpAttribute.cpp b/media/webrtc/signaling/src/sdp/SdpAttribute.cpp
index 00c01d2a7d43..06fc94dbb5de 100644
--- a/media/webrtc/signaling/src/sdp/SdpAttribute.cpp
+++ b/media/webrtc/signaling/src/sdp/SdpAttribute.cpp
@@ -1131,6 +1131,7 @@ ShouldSerializeChannels(SdpRtpmapAttributeList::CodecType type)
     case SdpRtpmapAttributeList::kH264:
     case SdpRtpmapAttributeList::kRed:
     case SdpRtpmapAttributeList::kUlpfec:
+    case SdpRtpmapAttributeList::kTelephoneEvent:
       return false;
     case SdpRtpmapAttributeList::kOtherCodec:
       return true;
diff --git a/media/webrtc/signaling/src/sdp/SdpAttribute.h b/media/webrtc/signaling/src/sdp/SdpAttribute.h
index e8b2020c21f7..d3cf547ff8a6 100644
--- a/media/webrtc/signaling/src/sdp/SdpAttribute.h
+++ b/media/webrtc/signaling/src/sdp/SdpAttribute.h
@@ -1087,6 +1087,7 @@ public:
     kH264,
     kRed,
     kUlpfec,
+    kTelephoneEvent,
     kOtherCodec
   };
 
@@ -1172,6 +1173,9 @@ inline std::ostream& operator<<(std::ostream& os,
     case SdpRtpmapAttributeList::kUlpfec:
       os << "ulpfec";
       break;
+    case SdpRtpmapAttributeList::kTelephoneEvent:
+      os << "telephone-event";
+      break;
     default:
       MOZ_ASSERT(false);
       os << "?";
@@ -1367,6 +1371,29 @@ public:
     unsigned int useInBandFec;
   };
 
+  class TelephoneEventParameters : public Parameters
+  {
+  public:
+    TelephoneEventParameters() :
+      Parameters(SdpRtpmapAttributeList::kTelephoneEvent),
+      dtmfTones("0-15")
+    {}
+
+    virtual Parameters*
+    Clone() const override
+    {
+      return new TelephoneEventParameters(*this);
+    }
+
+    void
+    Serialize(std::ostream& os) const override
+    {
+      os << dtmfTones;
+    }
+
+    std::string dtmfTones;
+  };
+
   class Fmtp
   {
   public:
diff --git a/media/webrtc/signaling/src/sdp/SdpMediaSection.cpp b/media/webrtc/signaling/src/sdp/SdpMediaSection.cpp
index 14c04f477b0d..bd3fab555fe2 100644
--- a/media/webrtc/signaling/src/sdp/SdpMediaSection.cpp
+++ b/media/webrtc/signaling/src/sdp/SdpMediaSection.cpp
@@ -47,6 +47,26 @@ SdpMediaSection::SetFmtp(const SdpFmtpAttributeList::Fmtp& fmtpToSet)
   GetAttributeList().SetAttribute(fmtps.release());
 }
 
+void
+SdpMediaSection::RemoveFmtp(const std::string& pt)
+{
+  UniquePtr<SdpFmtpAttributeList> fmtps(new SdpFmtpAttributeList);
+
+  SdpAttributeList& attrList = GetAttributeList();
+  if (attrList.HasAttribute(SdpAttribute::kFmtpAttribute)) {
+    *fmtps = attrList.GetFmtp();
+  }
+
+  for (size_t i = 0; i < fmtps->mFmtps.size(); ++i) {
+    if (pt == fmtps->mFmtps[i].format) {
+      fmtps->mFmtps.erase(fmtps->mFmtps.begin() + i);
+      break;
+    }
+  }
+
+  attrList.SetAttribute(fmtps.release());
+}
+
 const SdpRtpmapAttributeList::Rtpmap*
 SdpMediaSection::FindRtpmap(const std::string& pt) const
 {
diff --git a/media/webrtc/signaling/src/sdp/SdpMediaSection.h b/media/webrtc/signaling/src/sdp/SdpMediaSection.h
index 6f120f3d638f..16242ab160d0 100644
--- a/media/webrtc/signaling/src/sdp/SdpMediaSection.h
+++ b/media/webrtc/signaling/src/sdp/SdpMediaSection.h
@@ -153,6 +153,7 @@ public:
 
   const SdpFmtpAttributeList::Parameters* FindFmtp(const std::string& pt) const;
   void SetFmtp(const SdpFmtpAttributeList::Fmtp& fmtp);
+  void RemoveFmtp(const std::string& pt);
   const SdpRtpmapAttributeList::Rtpmap* FindRtpmap(const std::string& pt) const;
   const SdpSctpmapAttributeList::Sctpmap* FindSctpmap(
       const std::string& pt) const;
diff --git a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
index b3d2d612c001..5357f4728c1c 100644
--- a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
+++ b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
@@ -363,6 +363,8 @@ SipccSdpAttributeList::GetCodecType(rtp_ptype type)
       return SdpRtpmapAttributeList::kRed;
     case RTP_ULPFEC:
       return SdpRtpmapAttributeList::kUlpfec;
+    case RTP_TELEPHONE_EVENT:
+      return SdpRtpmapAttributeList::kTelephoneEvent;
     case RTP_NONE:
     // Happens when sipcc doesn't know how to translate to the enum
     case RTP_CELP:
@@ -377,7 +379,6 @@ SipccSdpAttributeList::GetCodecType(rtp_ptype type)
     case RTP_JPEG:
     case RTP_NV:
     case RTP_H261:
-    case RTP_AVT:
     case RTP_L16:
     case RTP_H263:
     case RTP_ILBC:
@@ -757,6 +758,14 @@ SipccSdpAttributeList::LoadFmtp(sdp_t* sdp, uint16_t level)
         opusParameters->useInBandFec = fmtp->useinbandfec;
         parameters.reset(opusParameters);
       } break;
+      case RTP_TELEPHONE_EVENT: {
+        SdpFmtpAttributeList::TelephoneEventParameters* teParameters(
+          new SdpFmtpAttributeList::TelephoneEventParameters);
+        if (strlen(fmtp->dtmf_tones) > 0) {
+          teParameters->dtmfTones = fmtp->dtmf_tones;
+        }
+        parameters.reset(teParameters);
+      } break;
       default: {
       }
     }
diff --git a/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h b/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
index e94f95dfcd39..8a04d8f0bfbd 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
@@ -33,7 +33,7 @@ typedef enum rtp_ptype_
     RTP_H261         = 31,
     RTP_H264_P0      = 97,
     RTP_H264_P1      = 126,
-    RTP_AVT          = 101,
+    RTP_TELEPHONE_EVENT = 101,
     RTP_L16          = 102,
     RTP_H263         = 103,
     RTP_ILBC         = 116, /* used only to make an offer */
diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp.h b/media/webrtc/signaling/src/sdp/sipcc/sdp.h
index 1eac709c80e2..9bd2ce132420 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp.h
@@ -716,6 +716,15 @@ typedef struct sdp_fmtp {
     /* RFC 5109 Section 4.2 for specifying redundant encodings */
     uint8_t              redundant_encodings[SDP_FMTP_MAX_REDUNDANT_ENCODINGS];
 
+    /* RFC 2833 Section 3.9 (4733) for specifying support DTMF tones:
+       The list of values consists of comma-separated elements, which
+       can be either a single decimal number or two decimal numbers
+       separated by a hyphen (dash), where the second number is larger
+       than the first. No whitespace is allowed between numbers or
+       hyphens. The list does not have to be sorted.
+     */
+    char                 dtmf_tones[SDP_MAX_STRING_LEN+1];
+
     /* Annex P can take one or more values in the range 1-4 . e.g P=1,3 */
     uint16_t                       annex_p_val_picture_resize; /* 1 = four; 2 = sixteenth */
     uint16_t                       annex_p_val_warp; /* 3 = half; 4=sixteenth */
diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp_access.c b/media/webrtc/signaling/src/sdp/sipcc/sdp_access.c
index 114f403a4b02..394e69bc8627 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_access.c
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_access.c
@@ -31,6 +31,7 @@ static const char* logTag = "sdp_access";
 #define SIPSDP_ATTR_ENCNAME_OPUS      "opus"
 #define SIPSDP_ATTR_ENCNAME_RED       "red"
 #define SIPSDP_ATTR_ENCNAME_ULPFEC    "ulpfec"
+#define SIPSDP_ATTR_ENCNAME_TELEPHONE_EVENT "telephone-event"
 
 /* Function:    sdp_find_media_level
  * Description: Find and return a pointer to the specified media level,
@@ -1385,6 +1386,9 @@ rtp_ptype sdp_get_known_payload_type(sdp_t *sdp_p,
         if (cpr_strcasecmp(encname, SIPSDP_ATTR_ENCNAME_ULPFEC) == 0) {
           return (RTP_ULPFEC);
         }
+        if (cpr_strcasecmp(encname, SIPSDP_ATTR_ENCNAME_TELEPHONE_EVENT) == 0) {
+          return (RTP_TELEPHONE_EVENT);
+        }
       }
     }
   }
diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c b/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
index dbad7b86e868..5bab0ba7d86e 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
@@ -453,6 +453,75 @@ static void sdp_attr_fmtp_invalid_value(sdp_t *sdp, char *param_name,
   sdp->conf_p->num_invalid_param++;
 }
 
+/*
+ * sdp_verify_attr_fmtp_telephone_event
+ * Helper function for verifying the telephone-event fmtp format
+ */
+static sdp_result_e sdp_verify_attr_fmtp_telephone_event(char *fmtpVal)
+{
+  size_t len = PL_strlen(fmtpVal);
+
+  // make sure the basics are good:
+  // - at least 1 character
+  // - no illegal chars
+  // - first char is a number
+  if (len < 1
+      || strspn(fmtpVal, "0123456789,-") != len
+      || PL_strstr(fmtpVal, ",,")
+      || fmtpVal[len-1] == ','
+      || !('0' <= fmtpVal[0] && fmtpVal[0] <= '9')) {
+    return SDP_INVALID_PARAMETER;
+  }
+
+  // Now that we've passed the basic sanity test, copy the string so we
+  // can tokenize and check the format of the tokens without disturbing
+  // the input string.
+  char dtmf_tones[SDP_MAX_STRING_LEN+1];
+  PL_strncpyz(dtmf_tones, fmtpVal, sizeof(dtmf_tones));
+
+  char *strtok_state;
+  char *temp = PL_strtok_r(dtmf_tones, ",", &strtok_state);
+
+  while (temp != NULL) {
+    len = PL_strlen(temp);
+    if (len > 5) {
+      // an example of a max size token is "11-15", so if the
+      // token is longer than 5 it is bad
+      return SDP_INVALID_PARAMETER;
+    }
+
+    // case where we have 1 or 2 characters, example 4 or 23
+    if (len < 3 && strspn(temp, "0123456789") != len) {
+      return SDP_INVALID_PARAMETER;
+    } else if (len >= 3) {
+      // case where we have 3-5 characters, ex 3-5, 2-33, or 10-20
+      sdp_result_e result1 = SDP_SUCCESS;
+      sdp_result_e result2 = SDP_SUCCESS;
+      uint8_t low_val;
+      uint8_t high_val;
+      low_val = (uint8_t)sdp_getnextnumtok(temp, (const char **)&temp,
+                                           "-", &result1);
+      high_val = (uint8_t)sdp_getnextnumtok(temp, (const char **)&temp,
+                                            "-", &result2);
+      if (temp[0] // we don't want to find a second hyphen
+          || result1 != SDP_SUCCESS
+          || result2 != SDP_SUCCESS) {
+        return SDP_INVALID_PARAMETER;
+      }
+
+      if (low_val > 99
+          || high_val > 99
+          || high_val <= low_val) {
+        return SDP_INVALID_PARAMETER;
+      }
+    }
+
+    temp=PL_strtok_r(NULL, ",", &strtok_state);
+  }
+
+  return SDP_SUCCESS;
+}
+
 /* Note:  The fmtp attribute formats currently handled are:
  *        fmtp:<payload type> <event>,<event>...
  *        fmtp:<payload_type> [annexa=yes/no] [annexb=yes/no] [bitrate=<value>]
@@ -1801,10 +1870,12 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
                     temp=PL_strtok_r(NULL, "/", &strtok_state);
                 }
             } /* if (temp) */
-        } else {
+        } else if (SDP_SUCCESS == sdp_verify_attr_fmtp_telephone_event(tmp)) {
           // XXX Note that DTMF fmtp will fall into here:
           // a=fmtp:101 0-15 (or 0-15,NN,NN etc)
-
+          sstrncpy(fmtp_p->dtmf_tones , tmp, sizeof(fmtp_p->dtmf_tones));
+          codec_info_found = TRUE;
+        } else {
           // unknown parameter - eat chars until ';'
           CSFLogDebug(logTag, "%s Unknown fmtp type (%s) - ignoring", __FUNCTION__,
                       tmp);
diff --git a/media/webrtc/signaling/test/jsep_session_unittest.cpp b/media/webrtc/signaling/test/jsep_session_unittest.cpp
index 32fb88ea98e6..d29400771fc1 100644
--- a/media/webrtc/signaling/test/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/test/jsep_session_unittest.cpp
@@ -640,6 +640,7 @@ protected:
         }
       }
     }
+    std::cerr << "OFFER pairs:" << std::endl;
     DumpTrackPairs(mSessionOff);
   }
 
@@ -677,6 +678,7 @@ protected:
         }
       }
     }
+    std::cerr << "ANSWER pairs:" << std::endl;
     DumpTrackPairs(mSessionAns);
   }
 
@@ -958,6 +960,18 @@ protected:
     (*sdp) = parsed->ToString();
   }
 
+  void
+  ReplaceInSdp(std::string* sdp,
+               const char* searchStr,
+               const char* replaceStr) const
+  {
+    if (searchStr[0] == '\0') return;
+    size_t pos;
+    while ((pos = sdp->find(searchStr)) != std::string::npos) {
+      sdp->replace(pos, strlen(searchStr), replaceStr);
+    }
+  }
+
   void
   ValidateDisabledMSection(const SdpMediaSection* msection)
   {
@@ -1003,9 +1017,16 @@ protected:
     std::cerr << "  encodings=" << std::endl;
     for (size_t i = 0; i < details->GetEncodingCount(); ++i) {
       const JsepTrackEncoding& encoding = details->GetEncoding(i);
-      std::cerr << "    id=" << encoding.mRid;
+      std::cerr << "    id=" << encoding.mRid << std::endl;
       for (const JsepCodecDescription* codec : encoding.GetCodecs()) {
-        std::cerr << "      " << codec->mName << std::endl;
+        std::cerr << "      " << codec->mName
+                  << " enabled(" << (codec->mEnabled?"yes":"no") << ")";
+        if (track.GetMediaType() == SdpMediaSection::kAudio) {
+          const JsepAudioCodecDescription* audioCodec =
+              static_cast<const JsepAudioCodecDescription*>(codec);
+          std::cerr << " dtmf(" << (audioCodec->mDtmfEnabled?"yes":"no") << ")";
+        }
+        std::cerr << std::endl;
       }
     }
   }
@@ -1947,6 +1968,79 @@ TEST_P(JsepSessionTest, RenegotiationAutoAssignedMsidIsStable)
   }
 }
 
+TEST_P(JsepSessionTest, RenegotiationOffererDisablesTelephoneEvent)
+{
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
+  OfferAnswer();
+
+  auto offererPairs = GetTrackPairsByLevel(mSessionOff);
+
+  // check all the audio tracks to make sure they have 2 codecs (109 and 101),
+  // and dtmf is enabled on all audio tracks
+  for (size_t i = 0; i < offererPairs.size(); ++i) {
+    std::vector<JsepTrack*> tracks;
+    tracks.push_back(offererPairs[i].mSending.get());
+    tracks.push_back(offererPairs[i].mReceiving.get());
+    for (JsepTrack *track : tracks) {
+      if (track->GetMediaType() != SdpMediaSection::kAudio) {
+        continue;
+      }
+      const JsepTrackNegotiatedDetails* details = track->GetNegotiatedDetails();
+      ASSERT_EQ(1U, details->GetEncodingCount());
+      const JsepTrackEncoding& encoding = details->GetEncoding(0);
+      ASSERT_EQ(2U, encoding.GetCodecs().size());
+      ASSERT_TRUE(encoding.HasFormat("109"));
+      ASSERT_TRUE(encoding.HasFormat("101"));
+      for (JsepCodecDescription* codec: encoding.GetCodecs()) {
+        ASSERT_TRUE(codec);
+        // we can cast here because we've already checked for audio track
+        JsepAudioCodecDescription *audioCodec =
+            static_cast<JsepAudioCodecDescription*>(codec);
+        ASSERT_TRUE(audioCodec->mDtmfEnabled);
+      }
+    }
+  }
+
+  std::string offer = CreateOffer();
+  ReplaceInSdp(&offer, " 109 101 ", " 109 ");
+  ReplaceInSdp(&offer, "a=fmtp:101 0-15\r\n", "");
+  ReplaceInSdp(&offer, "a=rtpmap:101 telephone-event/8000/1\r\n", "");
+  std::cerr << "modified OFFER: " << offer << std::endl;
+
+  SetLocalOffer(offer);
+  SetRemoteOffer(offer);
+  AddTracks(mSessionAns);
+  std::string answer = CreateAnswer();
+  SetLocalAnswer(answer);
+  SetRemoteAnswer(answer);
+
+  auto newOffererPairs = GetTrackPairsByLevel(mSessionOff);
+
+  // check all the audio tracks to make sure they have 1 codec (109),
+  // and dtmf is disabled on all audio tracks
+  for (size_t i = 0; i < newOffererPairs.size(); ++i) {
+    std::vector<JsepTrack*> tracks;
+    tracks.push_back(newOffererPairs[i].mSending.get());
+    tracks.push_back(newOffererPairs[i].mReceiving.get());
+    for (JsepTrack* track : tracks) {
+      if (track->GetMediaType() != SdpMediaSection::kAudio) {
+        continue;
+      }
+      const JsepTrackNegotiatedDetails* details = track->GetNegotiatedDetails();
+      ASSERT_EQ(1U, details->GetEncodingCount());
+      const JsepTrackEncoding& encoding = details->GetEncoding(0);
+      ASSERT_EQ(1U, encoding.GetCodecs().size());
+      ASSERT_TRUE(encoding.HasFormat("109"));
+      // we can cast here because we've already checked for audio track
+      JsepAudioCodecDescription *audioCodec =
+          static_cast<JsepAudioCodecDescription*>(encoding.GetCodecs()[0]);
+      ASSERT_TRUE(audioCodec);
+      ASSERT_FALSE(audioCodec->mDtmfEnabled);
+    }
+  }
+}
+
 // Tests behavior when the answerer does not use msid in the initial exchange,
 // but does on renegotiation.
 TEST_P(JsepSessionTest, RenegotiationAnswererEnablesMsid)
@@ -2819,7 +2913,7 @@ TEST_F(JsepSessionTest, CreateOfferNoDatachannelDefault)
             outputSdp->GetMediaSection(1).GetMediaType());
 }
 
-TEST_F(JsepSessionTest, ValidateOfferedCodecParams)
+TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams)
 {
   types.push_back(SdpMediaSection::kAudio);
   types.push_back(SdpMediaSection::kVideo);
@@ -2946,6 +3040,88 @@ TEST_F(JsepSessionTest, ValidateOfferedCodecParams)
   ASSERT_EQ(123, parsed_red_params.encodings[4]);
 }
 
+TEST_F(JsepSessionTest, ValidateOfferedAudioCodecParams)
+{
+  types.push_back(SdpMediaSection::kAudio);
+  types.push_back(SdpMediaSection::kVideo);
+
+  RefPtr<JsepTrack> msta(
+      new JsepTrack(SdpMediaSection::kAudio, "offerer_stream", "a1"));
+  mSessionOff.AddTrack(msta);
+  RefPtr<JsepTrack> mstv1(
+      new JsepTrack(SdpMediaSection::kVideo, "offerer_stream", "v2"));
+  mSessionOff.AddTrack(mstv1);
+
+  std::string offer = CreateOffer();
+
+  UniquePtr<Sdp> outputSdp(Parse(offer));
+  ASSERT_TRUE(!!outputSdp);
+
+  ASSERT_EQ(2U, outputSdp->GetMediaSectionCount());
+  auto& audio_section = outputSdp->GetMediaSection(0);
+  ASSERT_EQ(SdpMediaSection::kAudio, audio_section.GetMediaType());
+  auto& audio_attrs = audio_section.GetAttributeList();
+  ASSERT_EQ(SdpDirectionAttribute::kSendrecv, audio_attrs.GetDirection());
+  ASSERT_EQ(5U, audio_section.GetFormats().size());
+  ASSERT_EQ("109", audio_section.GetFormats()[0]);
+  ASSERT_EQ("9", audio_section.GetFormats()[1]);
+  ASSERT_EQ("0", audio_section.GetFormats()[2]);
+  ASSERT_EQ("8", audio_section.GetFormats()[3]);
+  ASSERT_EQ("101", audio_section.GetFormats()[4]);
+
+  // Validate rtpmap
+  ASSERT_TRUE(audio_attrs.HasAttribute(SdpAttribute::kRtpmapAttribute));
+  auto& rtpmaps = audio_attrs.GetRtpmap();
+  ASSERT_TRUE(rtpmaps.HasEntry("109"));
+  ASSERT_TRUE(rtpmaps.HasEntry("9"));
+  ASSERT_TRUE(rtpmaps.HasEntry("0"));
+  ASSERT_TRUE(rtpmaps.HasEntry("8"));
+  ASSERT_TRUE(rtpmaps.HasEntry("101"));
+
+  auto& opus_entry = rtpmaps.GetEntry("109");
+  auto& g722_entry = rtpmaps.GetEntry("9");
+  auto& pcmu_entry = rtpmaps.GetEntry("0");
+  auto& pcma_entry = rtpmaps.GetEntry("8");
+  auto& telephone_event_entry = rtpmaps.GetEntry("101");
+
+  ASSERT_EQ("opus", opus_entry.name);
+  ASSERT_EQ("G722", g722_entry.name);
+  ASSERT_EQ("PCMU", pcmu_entry.name);
+  ASSERT_EQ("PCMA", pcma_entry.name);
+  ASSERT_EQ("telephone-event", telephone_event_entry.name);
+
+  // Validate fmtps
+  ASSERT_TRUE(audio_attrs.HasAttribute(SdpAttribute::kFmtpAttribute));
+  auto& fmtps = audio_attrs.GetFmtp().mFmtps;
+
+  ASSERT_EQ(2U, fmtps.size());
+
+  // opus
+  const SdpFmtpAttributeList::Parameters* opus_params =
+    audio_section.FindFmtp("109");
+  ASSERT_TRUE(opus_params);
+  ASSERT_EQ(SdpRtpmapAttributeList::kOpus, opus_params->codec_type);
+
+  auto& parsed_opus_params =
+      *static_cast<const SdpFmtpAttributeList::OpusParameters*>(opus_params);
+
+  ASSERT_EQ((uint32_t)48000, parsed_opus_params.maxplaybackrate);
+  ASSERT_EQ((uint32_t)1, parsed_opus_params.stereo);
+  ASSERT_EQ((uint32_t)0, parsed_opus_params.useInBandFec);
+
+  // dtmf
+  const SdpFmtpAttributeList::Parameters* dtmf_params =
+    audio_section.FindFmtp("101");
+  ASSERT_TRUE(dtmf_params);
+  ASSERT_EQ(SdpRtpmapAttributeList::kTelephoneEvent, dtmf_params->codec_type);
+
+  auto& parsed_dtmf_params =
+      *static_cast<const SdpFmtpAttributeList::TelephoneEventParameters*>
+          (dtmf_params);
+
+  ASSERT_EQ("0-15", parsed_dtmf_params.dtmfTones);
+}
+
 TEST_F(JsepSessionTest, ValidateAnsweredCodecParams)
 {
   // TODO(bug 1099351): Once fixed, we can allow red in this offer,
diff --git a/media/webrtc/signaling/test/jsep_track_unittest.cpp b/media/webrtc/signaling/test/jsep_track_unittest.cpp
index 63ae1c05b5dd..a09d47276231 100644
--- a/media/webrtc/signaling/test/jsep_track_unittest.cpp
+++ b/media/webrtc/signaling/test/jsep_track_unittest.cpp
@@ -32,13 +32,20 @@ class JsepTrackTest : public ::testing::Test
     JsepTrackTest() {}
 
     std::vector<JsepCodecDescription*>
-    MakeCodecs(bool addFecCodecs = false, bool preferRed = false) const
+    MakeCodecs(bool addFecCodecs = false,
+               bool preferRed = false,
+               bool addDtmfCodec = false) const
     {
       std::vector<JsepCodecDescription*> results;
       results.push_back(
           new JsepAudioCodecDescription("1", "opus", 48000, 2, 960, 40000));
       results.push_back(
           new JsepAudioCodecDescription("9", "G722", 8000, 1, 320, 64000));
+      if (addDtmfCodec) {
+        results.push_back(
+            new JsepAudioCodecDescription("101", "telephone-event",
+                                          8000, 1, 0, 0));
+      }
 
       JsepVideoCodecDescription* red = nullptr;
       if (addFecCodecs && preferRed) {
@@ -243,22 +250,44 @@ class JsepTrackTest : public ::testing::Test
       CheckEncodingCount(expected, mSendAns, mRecvOff);
     }
 
+    const JsepCodecDescription*
+    GetCodec(const JsepTrack& track,
+             SdpMediaSection::MediaType type,
+             size_t expectedSize,
+             size_t codecIndex) const
+    {
+      if (!track.GetNegotiatedDetails() ||
+          track.GetNegotiatedDetails()->GetEncodingCount() != 1U ||
+          track.GetMediaType() != type) {
+        return nullptr;
+      }
+      const std::vector<JsepCodecDescription*>& codecs =
+        track.GetNegotiatedDetails()->GetEncoding(0).GetCodecs();
+      // it should not be possible for codecs to have a different type
+      // than the track, but we'll check the codec here just in case.
+      if (codecs.size() != expectedSize || codecIndex >= expectedSize ||
+          codecs[codecIndex]->mType != type) {
+        return nullptr;
+      }
+      return codecs[codecIndex];
+    }
+
     const JsepVideoCodecDescription*
     GetVideoCodec(const JsepTrack& track,
                   size_t expectedSize = 1,
                   size_t codecIndex = 0) const
     {
-      if (!track.GetNegotiatedDetails() ||
-          track.GetNegotiatedDetails()->GetEncodingCount() != 1U) {
-        return nullptr;
-      }
-      const std::vector<JsepCodecDescription*>& codecs =
-        track.GetNegotiatedDetails()->GetEncoding(0).GetCodecs();
-      if (codecs.size() != expectedSize ||
-          codecs[codecIndex]->mType != SdpMediaSection::kVideo) {
-        return nullptr;
-      }
-      return static_cast<const JsepVideoCodecDescription*>(codecs[0]);
+      return static_cast<const JsepVideoCodecDescription*>
+        (GetCodec(track, SdpMediaSection::kVideo, expectedSize, codecIndex));
+    }
+
+    const JsepAudioCodecDescription*
+    GetAudioCodec(const JsepTrack& track,
+                  size_t expectedSize = 1,
+                  size_t codecIndex = 0) const
+    {
+      return static_cast<const JsepAudioCodecDescription*>
+        (GetCodec(track, SdpMediaSection::kAudio, expectedSize, codecIndex));
     }
 
     void CheckOtherFbsSize(const JsepTrack& track, size_t expected) const
@@ -401,6 +430,339 @@ TEST_F(JsepTrackTest, VideoNegotiation)
   CheckAnsEncodingCount(1);
 }
 
+class CheckForCodecType
+{
+public:
+  explicit CheckForCodecType(SdpMediaSection::MediaType type,
+                             bool *result) :
+    mResult(result),
+    mType(type) {}
+
+  void operator()(JsepCodecDescription* codec) {
+    if (codec->mType == mType) {
+      *mResult = true;
+    }
+  }
+
+private:
+  bool *mResult;
+  SdpMediaSection::MediaType mType;
+};
+
+TEST_F(JsepTrackTest, CheckForMismatchedAudioCodecAndVideoTrack)
+{
+  PtrVector<JsepCodecDescription> offerCodecs;
+
+  // make codecs including telephone-event (an audio codec)
+  offerCodecs.values = MakeCodecs(false, false, true);
+  RefPtr<JsepTrack> videoTrack = new JsepTrack(SdpMediaSection::kVideo,
+                                               "stream_id",
+                                               "track_id",
+                                               sdp::kSend);
+  // populate codecs and then make sure we don't have any audio codecs
+  // in the video track
+  videoTrack->PopulateCodecs(offerCodecs.values);
+
+  bool found = false;
+  videoTrack->ForEachCodec(CheckForCodecType(SdpMediaSection::kAudio, &found));
+  ASSERT_FALSE(found);
+
+  found = false;
+  videoTrack->ForEachCodec(CheckForCodecType(SdpMediaSection::kVideo, &found));
+  ASSERT_TRUE(found); // for sanity, make sure we did find video codecs
+}
+
+TEST_F(JsepTrackTest, CheckVideoTrackWithHackedDtmfSdp)
+{
+  Init(SdpMediaSection::kVideo);
+  CreateOffer();
+  // make sure we don't find sdp containing telephone-event in video track
+  ASSERT_EQ(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  // force audio codec telephone-event into video m= section of offer
+  GetOffer().AddCodec("101", "telephone-event", 8000, 1);
+  // make sure we _do_ find sdp containing telephone-event in video track
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  CreateAnswer();
+  // make sure we don't find sdp containing telephone-event in video track
+  ASSERT_EQ(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  // force audio codec telephone-event into video m= section of answer
+  GetAnswer().AddCodec("101", "telephone-event", 8000, 1);
+  // make sure we _do_ find sdp containing telephone-event in video track
+  ASSERT_NE(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  Negotiate();
+  SanityCheck();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_TRUE(mSendOff.get());
+  ASSERT_TRUE(mRecvOff.get());
+  ASSERT_TRUE(mSendAns.get());
+  ASSERT_TRUE(mRecvAns.get());
+
+  // make sure we still don't find any audio codecs in the video track after
+  // hacking the sdp
+  bool found = false;
+  mSendOff->ForEachCodec(CheckForCodecType(SdpMediaSection::kAudio, &found));
+  ASSERT_FALSE(found);
+  mRecvOff->ForEachCodec(CheckForCodecType(SdpMediaSection::kAudio, &found));
+  ASSERT_FALSE(found);
+  mSendAns->ForEachCodec(CheckForCodecType(SdpMediaSection::kAudio, &found));
+  ASSERT_FALSE(found);
+  mRecvAns->ForEachCodec(CheckForCodecType(SdpMediaSection::kAudio, &found));
+  ASSERT_FALSE(found);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationOffererDtmf)
+{
+  mOffCodecs.values = MakeCodecs(false, false, true);
+  mAnsCodecs.values = MakeCodecs(false, false, false);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+  OfferAnswer();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_NE(mOffer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=fmtp:101"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns)));
+  ASSERT_EQ("1", track->mDefaultPt);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationAnswererDtmf)
+{
+  mOffCodecs.values = MakeCodecs(false, false, false);
+  mAnsCodecs.values = MakeCodecs(false, false, true);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+  OfferAnswer();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_EQ(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_EQ(mOffer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=fmtp:101"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns)));
+  ASSERT_EQ("1", track->mDefaultPt);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationOffererAnswererDtmf)
+{
+  mOffCodecs.values = MakeCodecs(false, false, true);
+  mAnsCodecs.values = MakeCodecs(false, false, true);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+  OfferAnswer();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_NE(mOffer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationDtmfOffererNoFmtpAnswererFmtp)
+{
+  mOffCodecs.values = MakeCodecs(false, false, true);
+  mAnsCodecs.values = MakeCodecs(false, false, true);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+
+  CreateOffer();
+  GetOffer().RemoveFmtp("101");
+
+  CreateAnswer();
+
+  Negotiate();
+  SanityCheck();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_EQ(mOffer->ToString().find("a=fmtp:101"), std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationDtmfOffererFmtpAnswererNoFmtp)
+{
+  mOffCodecs.values = MakeCodecs(false, false, true);
+  mAnsCodecs.values = MakeCodecs(false, false, true);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+
+  CreateOffer();
+
+  CreateAnswer();
+  GetAnswer().RemoveFmtp("101");
+
+  Negotiate();
+  SanityCheck();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_NE(mOffer->ToString().find("a=fmtp:101 0-15"), std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=fmtp:101"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+}
+
+TEST_F(JsepTrackTest, AudioNegotiationDtmfOffererNoFmtpAnswererNoFmtp)
+{
+  mOffCodecs.values = MakeCodecs(false, false, true);
+  mAnsCodecs.values = MakeCodecs(false, false, true);
+
+  InitTracks(SdpMediaSection::kAudio);
+  InitSdp(SdpMediaSection::kAudio);
+
+  CreateOffer();
+  GetOffer().RemoveFmtp("101");
+
+  CreateAnswer();
+  GetAnswer().RemoveFmtp("101");
+
+  Negotiate();
+  SanityCheck();
+
+  CheckOffEncodingCount(1);
+  CheckAnsEncodingCount(1);
+
+  ASSERT_NE(mOffer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+  ASSERT_NE(mAnswer->ToString().find("a=rtpmap:101 telephone-event"),
+            std::string::npos);
+
+  ASSERT_EQ(mOffer->ToString().find("a=fmtp:101"), std::string::npos);
+  ASSERT_EQ(mAnswer->ToString().find("a=fmtp:101"), std::string::npos);
+
+  const JsepAudioCodecDescription* track = nullptr;
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2)));
+  ASSERT_EQ("1", track->mDefaultPt);
+
+  ASSERT_TRUE((track = GetAudioCodec(*mSendOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvOff, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mSendAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+  ASSERT_TRUE((track = GetAudioCodec(*mRecvAns, 2, 1)));
+  ASSERT_EQ("101", track->mDefaultPt);
+}
+
 TEST_F(JsepTrackTest, VideoNegotationOffererFEC)
 {
   mOffCodecs.values = MakeCodecs(true);
diff --git a/media/webrtc/signaling/test/sdp_unittests.cpp b/media/webrtc/signaling/test/sdp_unittests.cpp
index b383d4872b56..7c9a1a78122a 100644
--- a/media/webrtc/signaling/test/sdp_unittests.cpp
+++ b/media/webrtc/signaling/test/sdp_unittests.cpp
@@ -1000,6 +1000,22 @@ class NewSdpTest : public ::testing::Test,
       ASSERT_EQ(extra, feedback.extra);
     }
 
+    void CheckDtmfFmtp(const std::string& expectedDtmfTones) const {
+      ASSERT_TRUE(mSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
+                  SdpAttribute::kFmtpAttribute));
+      auto audio_format_params =
+          mSdp->GetMediaSection(0).GetAttributeList().GetFmtp().mFmtps;
+      ASSERT_EQ(2U, audio_format_params.size());
+
+      ASSERT_EQ("101", audio_format_params[1].format);
+      ASSERT_TRUE(!!audio_format_params[1].parameters);
+      const SdpFmtpAttributeList::TelephoneEventParameters* te_parameters =
+        static_cast<SdpFmtpAttributeList::TelephoneEventParameters*>(
+            audio_format_params[1].parameters.get());
+      ASSERT_NE(0U, te_parameters->dtmfTones.size());
+      ASSERT_EQ(expectedDtmfTones, te_parameters->dtmfTones);
+    }
+
     void CheckSerialize(const std::string& expected,
                         const SdpAttribute& attr) const {
       std::stringstream str;
@@ -1211,7 +1227,7 @@ const std::string kBasicAudioVideoOffer =
 "a=rtpmap:0 PCMU/8000" CRLF
 "a=rtpmap:8 PCMA/8000" CRLF
 "a=rtpmap:101 telephone-event/8000" CRLF
-"a=fmtp:101 0-15" CRLF
+"a=fmtp:101 0-15,66,32-34,67" CRLF
 "a=ice-ufrag:00000000" CRLF
 "a=ice-pwd:0000000000000000000000000000000" CRLF
 "a=sendonly" CRLF
@@ -1279,6 +1295,41 @@ TEST_P(NewSdpTest, BasicAudioVideoSdpParse) {
   ParseSdp(kBasicAudioVideoOffer);
 }
 
+TEST_P(NewSdpTest, CheckRemoveFmtp) {
+  ParseSdp(kBasicAudioVideoOffer);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(3U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  SdpAttributeList& audioAttrList = mSdp->GetMediaSection(0).GetAttributeList();
+
+  ASSERT_TRUE(audioAttrList.HasAttribute(SdpAttribute::kFmtpAttribute));
+  ASSERT_EQ(2U, audioAttrList.GetFmtp().mFmtps.size());
+  ASSERT_TRUE(mSdp->GetMediaSection(0).FindFmtp("109"));
+  ASSERT_TRUE(mSdp->GetMediaSection(0).FindFmtp("101"));
+
+  mSdp->GetMediaSection(0).RemoveFmtp("101");
+
+  ASSERT_TRUE(audioAttrList.HasAttribute(SdpAttribute::kFmtpAttribute));
+  ASSERT_EQ(1U, audioAttrList.GetFmtp().mFmtps.size());
+  ASSERT_TRUE(mSdp->GetMediaSection(0).FindFmtp("109"));
+  ASSERT_FALSE(mSdp->GetMediaSection(0).FindFmtp("101"));
+
+  mSdp->GetMediaSection(0).RemoveFmtp("109");
+
+  ASSERT_TRUE(audioAttrList.HasAttribute(SdpAttribute::kFmtpAttribute));
+  ASSERT_EQ(0U, audioAttrList.GetFmtp().mFmtps.size());
+  ASSERT_FALSE(mSdp->GetMediaSection(0).FindFmtp("109"));
+  ASSERT_FALSE(mSdp->GetMediaSection(0).FindFmtp("101"));
+
+  // make sure we haven't disturbed the video fmtps
+  SdpAttributeList& videoAttrList = mSdp->GetMediaSection(1).GetAttributeList();
+  ASSERT_TRUE(videoAttrList.HasAttribute(SdpAttribute::kFmtpAttribute));
+  ASSERT_EQ(2U, videoAttrList.GetFmtp().mFmtps.size());
+  ASSERT_TRUE(mSdp->GetMediaSection(1).FindFmtp("120"));
+  ASSERT_TRUE(mSdp->GetMediaSection(1).FindFmtp("121"));
+}
+
 TEST_P(NewSdpTest, CheckIceUfrag) {
   ParseSdp(kBasicAudioVideoOffer);
   ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
@@ -1532,7 +1583,7 @@ TEST_P(NewSdpTest, CheckRtpmap) {
               rtpmap);
 
   CheckRtpmap("101",
-              SdpRtpmapAttributeList::kOtherCodec,
+              SdpRtpmapAttributeList::kTelephoneEvent,
               "telephone-event",
               8000,
               1,
@@ -1578,6 +1629,232 @@ TEST_P(NewSdpTest, CheckRtpmap) {
               videoRtpmap);
 }
 
+static const std::string kAudioWithTelephoneEvent =
+  "v=0" CRLF
+  "o=- 4294967296 2 IN IP4 127.0.0.1" CRLF
+  "s=SIP Call" CRLF
+  "c=IN IP4 198.51.100.7" CRLF
+  "t=0 0" CRLF
+  "m=audio 9 RTP/SAVPF 109 9 0 8 101" CRLF
+  "c=IN IP4 0.0.0.0" CRLF
+  "a=mid:first" CRLF
+  "a=rtpmap:109 opus/48000/2" CRLF
+  "a=fmtp:109 maxplaybackrate=32000;stereo=1" CRLF
+  "a=ptime:20" CRLF
+  "a=maxptime:20" CRLF
+  "a=rtpmap:9 G722/8000" CRLF
+  "a=rtpmap:0 PCMU/8000" CRLF
+  "a=rtpmap:8 PCMA/8000" CRLF
+  "a=rtpmap:101 telephone-event/8000" CRLF;
+
+TEST_P(NewSdpTest, CheckTelephoneEventNoFmtp) {
+  ParseSdp(kAudioWithTelephoneEvent);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  ASSERT_TRUE(mSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
+              SdpAttribute::kFmtpAttribute));
+  auto audio_format_params =
+      mSdp->GetMediaSection(0).GetAttributeList().GetFmtp().mFmtps;
+  ASSERT_EQ(1U, audio_format_params.size());
+
+  // make sure we don't get a fmtp for codec 101
+  for (size_t i = 0; i < audio_format_params.size(); ++i) {
+    ASSERT_NE("101", audio_format_params[i].format);
+  }
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventWithDefaultEvents) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0-15" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventWithBadCharacter) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0-5." CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventIncludingCommas) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0-15,66,67" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("0-15,66,67");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventComplexEvents) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0,1,2-4,5-15,66,67" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("0,1,2-4,5-15,66,67");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventNoHyphen) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 5,6,7" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("5,6,7");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventOnlyZero) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("0");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventOnlyOne) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 1" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  CheckDtmfFmtp("1");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadThreeDigit) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 123" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadThreeDigitWithHyphen) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 0-123" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadLeadingHyphen) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 -12" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadTrailingHyphen) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 12-" CRLF, false);
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadTrailingHyphenInMiddle) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 1,12-,4" CRLF, false);
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadLeadingComma) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 ,2,3" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadMultipleLeadingComma) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 ,,,2,3" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadConsecutiveCommas) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 1,,,,,,,,3" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadTrailingComma) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 1,2,3," CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadTwoHyphens) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 1-2-3" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadSixDigit) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 112233" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
+TEST_P(NewSdpTest, CheckTelephoneEventBadRangeReversed) {
+  ParseSdp(kAudioWithTelephoneEvent
+           + "a=fmtp:101 33-2" CRLF);
+  ASSERT_TRUE(!!mSdp) << "Parse failed: " << GetParseErrors();
+  ASSERT_EQ(1U, mSdp->GetMediaSectionCount())
+    << "Wrong number of media sections";
+
+  // check for the default dtmf tones
+  CheckDtmfFmtp("0-15");
+}
+
 static const std::string kVideoWithRedAndUlpfecSdp =
   "v=0" CRLF
   "o=- 4294967296 2 IN IP4 127.0.0.1" CRLF
@@ -1688,6 +1965,7 @@ const std::string kH264AudioVideoOffer =
 "a=rtpmap:8 PCMA/8000" CRLF
 "a=rtpmap:101 telephone-event/8000" CRLF
 "a=fmtp:109 maxplaybackrate=32000;stereo=1;useinbandfec=1" CRLF
+"a=fmtp:101 0-15,66,32-34,67" CRLF
 "a=ice-ufrag:00000000" CRLF
 "a=ice-pwd:0000000000000000000000000000000" CRLF
 "a=sendonly" CRLF
@@ -1741,7 +2019,7 @@ TEST_P(NewSdpTest, CheckFormatParameters) {
       SdpAttribute::kFmtpAttribute));
   auto audio_format_params =
       mSdp->GetMediaSection(0).GetAttributeList().GetFmtp().mFmtps;
-  ASSERT_EQ(1U, audio_format_params.size());
+  ASSERT_EQ(2U, audio_format_params.size());
   ASSERT_EQ("109", audio_format_params[0].format);
   ASSERT_TRUE(!!audio_format_params[0].parameters);
   const SdpFmtpAttributeList::OpusParameters* opus_parameters =
@@ -1750,6 +2028,13 @@ TEST_P(NewSdpTest, CheckFormatParameters) {
   ASSERT_EQ(32000U, opus_parameters->maxplaybackrate);
   ASSERT_EQ(1U, opus_parameters->stereo);
   ASSERT_EQ(1U, opus_parameters->useInBandFec);
+  ASSERT_EQ("101", audio_format_params[1].format);
+  ASSERT_TRUE(!!audio_format_params[1].parameters);
+  const SdpFmtpAttributeList::TelephoneEventParameters* te_parameters =
+    static_cast<SdpFmtpAttributeList::TelephoneEventParameters*>(
+        audio_format_params[1].parameters.get());
+  ASSERT_NE(0U, te_parameters->dtmfTones.size());
+  ASSERT_EQ("0-15,66,32-34,67", te_parameters->dtmfTones);
 
   ASSERT_TRUE(mSdp->GetMediaSection(1).GetAttributeList().HasAttribute(
       SdpAttribute::kFmtpAttribute));

From d35956ee161408a8f4df96d457a8e2d48dd036dd Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Wed, 28 Sep 2016 21:22:44 -0500
Subject: [PATCH 19/57] Bug 1291714 - bool to enable dtmf tones in AudioConduit
 and setup dtmf payload type. r=bwc

MozReview-Commit-ID: IMneZx9wlhj

--HG--
extra : rebase_source : 0e65711f7a36f75c8956efb0860fd63f7890a279
---
 .../src/media-conduit/AudioConduit.cpp        | 21 +++++++++++++++++++
 .../src/media-conduit/AudioConduit.h          |  4 ++++
 .../src/media-conduit/MediaConduitInterface.h |  2 ++
 .../peerconnection/MediaPipelineFactory.cpp   |  7 +++++++
 4 files changed, 34 insertions(+)

diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
index 76bfae0edee6..3cc96c4c6eb9 100755
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -26,6 +26,7 @@
 #include "webrtc/common.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_dtmf.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 
@@ -220,6 +221,24 @@ bool WebrtcAudioConduit::GetRTCPSenderReport(DOMHighResTimeStamp* timestamp,
    return result;
  }
 
+bool WebrtcAudioConduit::SetDtmfPayloadType(unsigned char type) {
+  CSFLogInfo(logTag, "%s : setting dtmf payload %d", __FUNCTION__, (int)type);
+
+  ScopedCustomReleasePtr<webrtc::VoEDtmf> mPtrVoEDtmf;
+  mPtrVoEDtmf = webrtc::VoEDtmf::GetInterface(mVoiceEngine);
+  if (!mPtrVoEDtmf) {
+    CSFLogError(logTag, "%s Unable to initialize VoEDtmf", __FUNCTION__);
+    return false;
+  }
+
+  int result = mPtrVoEDtmf->SetSendTelephoneEventPayloadType(mChannel, type);
+  if (result == -1) {
+    CSFLogError(logTag, "%s Failed call to SetSendTelephoneEventPayloadType",
+                        __FUNCTION__);
+  }
+  return result != -1;
+}
+
 /*
  * WebRTCAudioConduit Implementation
  */
@@ -403,6 +422,8 @@ WebrtcAudioConduit::ConfigureSendMediaCodec(const AudioCodecConfig* codecConfig)
     return kMediaConduitFECStatusError;
   }
 
+  mDtmfEnabled = codecConfig->mDtmfEnabled;
+
   if (codecConfig->mName == "opus" && codecConfig->mMaxPlaybackRate) {
     if (mPtrVoECodec->SetOpusMaxPlaybackRate(
           mChannel,
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.h b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
index c33da7918b9a..84d7f7497ef1 100755
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.h
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.h
@@ -169,6 +169,7 @@ public:
                       mEngineTransmitting(false),
                       mEngineReceiving(false),
                       mChannel(-1),
+                      mDtmfEnabled(false),
                       mCodecMutex("AudioConduit codec db"),
                       mCaptureDelay(150),
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
@@ -219,6 +220,8 @@ public:
                            unsigned int* packetsSent,
                            uint64_t* bytesSent) override;
 
+  bool SetDtmfPayloadType(unsigned char type) override;
+
 private:
   WebrtcAudioConduit(const WebrtcAudioConduit& other) = delete;
   void operator=(const WebrtcAudioConduit& other) = delete;
@@ -276,6 +279,7 @@ private:
   AutoTArray<Processing,8> mProcessing;
 
   int mChannel;
+  bool mDtmfEnabled;
   RecvCodecList    mRecvCodecList;
 
   Mutex mCodecMutex; // protects mCurSendCodecConfig
diff --git a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
index 8ad2be4baec8..bd09df9f60cd 100755
--- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
+++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
@@ -485,6 +485,8 @@ public:
     */
   virtual MediaConduitErrorCode EnableAudioLevelExtension(bool enabled, uint8_t id) = 0;
 
+  virtual bool SetDtmfPayloadType(unsigned char type) = 0;
+
 };
 }
 #endif
diff --git a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
index d83189407f1d..f4bdbefbaaa8 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -747,6 +747,13 @@ MediaPipelineFactory::GetOrCreateAudioConduit(
 
     conduit->SetLocalCNAME(aTrack.GetCNAME().c_str());
 
+    if (configs.values.size() > 1
+        && configs.values.back()->mName == "telephone-event") {
+      // we have a telephone event codec, so we need to make sure
+      // the dynamic pt is set properly
+      conduit->SetDtmfPayloadType(configs.values.back()->mType);
+    }
+
     auto error = conduit->ConfigureSendMediaCodec(configs.values[0]);
     if (error) {
       MOZ_MTLOG(ML_ERROR, "ConfigureSendMediaCodec failed: " << error);

From 5215e6924560b944d8a1cb5d5531d90c0d87c581 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Tue, 4 Oct 2016 09:40:32 +1300
Subject: [PATCH 20/57] Bug 1307248 - Add Is{Primetime,Widevine}KeySystem()
 functions. r=jwwang

MozReview-Commit-ID: GnH0T8IJhgR

--HG--
extra : rebase_source : cbaa64436e8ce034f6c953afa74001054f2ade0a
---
 dom/media/eme/EMEUtils.cpp | 24 ++++++++++++++++++------
 dom/media/eme/EMEUtils.h   |  6 ++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dom/media/eme/EMEUtils.cpp b/dom/media/eme/EMEUtils.cpp
index ece3636bd662..4532fb4dfea7 100644
--- a/dom/media/eme/EMEUtils.cpp
+++ b/dom/media/eme/EMEUtils.cpp
@@ -132,6 +132,24 @@ CopyArrayBufferViewOrArrayBufferData(const dom::ArrayBufferViewOrArrayBuffer& aB
   aOutData.AppendElements(data.mData, data.mLength);
 }
 
+bool
+IsClearkeyKeySystem(const nsAString& aKeySystem)
+{
+  return !CompareUTF8toUTF16(kEMEKeySystemClearkey, aKeySystem);
+}
+
+bool
+IsPrimetimeKeySystem(const nsAString& aKeySystem)
+{
+  return !CompareUTF8toUTF16(kEMEKeySystemPrimetime, aKeySystem);
+}
+
+bool
+IsWidevineKeySystem(const nsAString& aKeySystem)
+{
+  return !CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem);
+}
+
 nsString
 KeySystemToGMPName(const nsAString& aKeySystem)
 {
@@ -148,12 +166,6 @@ KeySystemToGMPName(const nsAString& aKeySystem)
   return EmptyString();
 }
 
-bool
-IsClearkeyKeySystem(const nsAString& aKeySystem)
-{
-  return !CompareUTF8toUTF16(kEMEKeySystemClearkey, aKeySystem);
-}
-
 CDMType
 ToCDMTypeTelemetryEnum(const nsString& aKeySystem)
 {
diff --git a/dom/media/eme/EMEUtils.h b/dom/media/eme/EMEUtils.h
index bbeaf1226cfa..276f94f36df0 100644
--- a/dom/media/eme/EMEUtils.h
+++ b/dom/media/eme/EMEUtils.h
@@ -106,6 +106,12 @@ KeySystemToGMPName(const nsAString& aKeySystem);
 bool
 IsClearkeyKeySystem(const nsAString& aKeySystem);
 
+bool
+IsPrimetimeKeySystem(const nsAString& aKeySystem);
+
+bool
+IsWidevineKeySystem(const nsAString& aKeySystem);
+
 enum CDMType {
   eClearKey = 0,
   ePrimetime = 1,

From b2629e2eec3d6ac5b0183277a65006439361260c Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Tue, 4 Oct 2016 09:48:28 +1300
Subject: [PATCH 21/57] Bug 1307248 - Replace uses of
 CompareUTF8toUTF16(kEMEKeySystem*) with Is*KeySystem(). r=jwwang

MozReview-Commit-ID: BTTacIyYfGZ

--HG--
extra : rebase_source : 4c3146ce7ca597c33871e8fb76b1c86d93c24ef7
---
 dom/media/eme/EMEUtils.cpp                    | 12 ++++++------
 dom/media/eme/MediaKeySystemAccess.cpp        | 12 ++++++------
 dom/media/eme/MediaKeySystemAccessManager.cpp |  5 ++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dom/media/eme/EMEUtils.cpp b/dom/media/eme/EMEUtils.cpp
index 4532fb4dfea7..c804462728ee 100644
--- a/dom/media/eme/EMEUtils.cpp
+++ b/dom/media/eme/EMEUtils.cpp
@@ -153,13 +153,13 @@ IsWidevineKeySystem(const nsAString& aKeySystem)
 nsString
 KeySystemToGMPName(const nsAString& aKeySystem)
 {
-  if (!CompareUTF8toUTF16(kEMEKeySystemPrimetime, aKeySystem)) {
+  if (IsPrimetimeKeySystem(aKeySystem)) {
     return NS_LITERAL_STRING("gmp-eme-adobe");
   }
-  if (!CompareUTF8toUTF16(kEMEKeySystemClearkey, aKeySystem)) {
+  if (IsClearkeyKeySystem(aKeySystem)) {
     return NS_LITERAL_STRING("gmp-clearkey");
   }
-  if (!CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem)) {
+  if (IsWidevineKeySystem(aKeySystem)) {
     return NS_LITERAL_STRING("gmp-widevinecdm");
   }
   MOZ_ASSERT(false, "We should only call this for known GMPs");
@@ -169,11 +169,11 @@ KeySystemToGMPName(const nsAString& aKeySystem)
 CDMType
 ToCDMTypeTelemetryEnum(const nsString& aKeySystem)
 {
-  if (!CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem)) {
+  if (IsWidevineKeySystem(aKeySystem)) {
     return CDMType::eWidevine;
-  } else if (!CompareUTF8toUTF16(kEMEKeySystemClearkey, aKeySystem)) {
+  } else if (IsClearkeyKeySystem(aKeySystem)) {
     return CDMType::eClearKey;
-  } else if (!CompareUTF8toUTF16(kEMEKeySystemPrimetime, aKeySystem)) {
+  } else if (IsPrimetimeKeySystem(aKeySystem)) {
     return CDMType::ePrimetime;
   }
   return CDMType::eUnknown;
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
index e4a968a2decf..74e444ccc1d3 100644
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -191,7 +191,7 @@ MediaKeySystemAccess::IsGMPPresentOnDisk(const nsAString& aKeySystem,
   bool isPresent = true;
 
 #if XP_WIN
-  if (!CompareUTF8toUTF16(kEMEKeySystemPrimetime, aKeySystem)) {
+  if (IsPrimetimeKeySystem(aKeySystem)) {
     if (!AdobePluginDLLExists(aVersion)) {
       NS_WARNING("Adobe EME plugin disappeared from disk!");
       aOutMessage = NS_LITERAL_CSTRING("Adobe DLL was expected to be on disk but was not");
@@ -276,12 +276,12 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
     return MediaKeySystemStatus::Error;
   }
 
-  if (!CompareUTF8toUTF16(kEMEKeySystemClearkey, aKeySystem)) {
+  if (IsClearkeyKeySystem(aKeySystem)) {
     return EnsureMinCDMVersion(mps, aKeySystem, aMinCdmVersion, aOutMessage, aOutCdmVersion);
   }
 
   if (Preferences::GetBool("media.gmp-eme-adobe.visible", false)) {
-    if (!CompareUTF8toUTF16(kEMEKeySystemPrimetime, aKeySystem)) {
+    if (IsPrimetimeKeySystem(aKeySystem)) {
       if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
         aOutMessage = NS_LITERAL_CSTRING("Adobe EME disabled");
         return MediaKeySystemStatus::Cdm_disabled;
@@ -298,7 +298,7 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
   }
 
   if (Preferences::GetBool("media.gmp-widevinecdm.visible", false)) {
-    if (!CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem)) {
+    if (IsWidevineKeySystem(aKeySystem)) {
 #ifdef XP_WIN
       // Win Vista and later only.
       if (!IsVistaOrLater()) {
@@ -563,7 +563,7 @@ CanDecryptAndDecode(mozIGeckoMediaPluginService* aGMPService,
     //  the Adobe GMP's unencrypted AAC decoding path being used to
     // decode content decrypted by the Widevine CDM.
     if (codec == GMP_CODEC_AAC &&
-        !CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem) &&
+        IsWidevineKeySystem(aKeySystem) &&
         !WMFDecoderModule::HasAAC()) {
       if (aDiagnostics) {
         aDiagnostics->SetKeySystemIssue(
@@ -1130,7 +1130,7 @@ GetSupportedConfig(mozIGeckoMediaPluginService* aGMPService,
 #if defined(XP_WIN)
   // Widevine CDM doesn't include an AAC decoder. So if WMF can't decode AAC,
   // and a codec wasn't specified, be conservative and reject the MediaKeys request.
-  if (!CompareUTF8toUTF16(kEMEKeySystemWidevine, aKeySystem.mKeySystem) &&
+  if (IsWidevineKeySystem(aKeySystem.mKeySystem) &&
       (aCandidate.mAudioCapabilities.IsEmpty() ||
        aCandidate.mVideoCapabilities.IsEmpty()) &&
      !WMFDecoderModule::HasAAC()) {
diff --git a/dom/media/eme/MediaKeySystemAccessManager.cpp b/dom/media/eme/MediaKeySystemAccessManager.cpp
index 1dd7e4e704a8..f2d8eda42801 100644
--- a/dom/media/eme/MediaKeySystemAccessManager.cpp
+++ b/dom/media/eme/MediaKeySystemAccessManager.cpp
@@ -142,8 +142,7 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
 
   if ((status == MediaKeySystemStatus::Cdm_not_installed ||
        status == MediaKeySystemStatus::Cdm_insufficient_version) &&
-      (!CompareUTF8toUTF16(kEMEKeySystemPrimetime, keySystem) ||
-       !CompareUTF8toUTF16(kEMEKeySystemWidevine, keySystem))) {
+      (IsPrimetimeKeySystem(keySystem) || IsWidevineKeySystem(keySystem))) {
     // These are cases which could be resolved by downloading a new(er) CDM.
     // When we send the status to chrome, chrome's GMPProvider will attempt to
     // download or update the CDM. In AwaitInstall() we add listeners to wait
@@ -154,7 +153,7 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
     if (aType == RequestType::Initial &&
         AwaitInstall(aPromise, aKeySystem, aConfigs)) {
       // Notify chrome that we're going to wait for the CDM to download/update.
-      // Note: If we're re-trying, we don't re-send the notificaiton,
+      // Note: If we're re-trying, we don't re-send the notification,
       // as chrome is already displaying the "we can't play, updating"
       // notification.
       MediaKeySystemAccess::NotifyObservers(mWindow, keySystem, status);

From 104fe2c9974f8de860634a82edd54afc5cc09f83 Mon Sep 17 00:00:00 2001
From: Samael Wang <freesamael@gmail.com>
Date: Fri, 30 Sep 2016 11:55:10 +0800
Subject: [PATCH 22/57] Bug 1300461 - UpdateIndex on LOAD_NORMAL_REPLACE,
 ReplaceEntry at requestedIndex when available. r=smaug

--HG--
extra : rebase_source : 9bb3c7488a1785ee5c4106b8e024555f31b3220c
---
 docshell/base/nsDocShell.cpp                  | 18 ++++--
 docshell/test/navigation/file_bug1300461.html | 63 +++++++++++++++++++
 .../test/navigation/file_bug1300461_back.html | 31 +++++++++
 .../navigation/file_bug1300461_redirect.html  | 10 +++
 .../file_bug1300461_redirect.html^headers^    |  2 +
 docshell/test/navigation/mochitest.ini        |  6 +-
 .../test/navigation/test_sessionhistory.html  |  5 +-
 7 files changed, 127 insertions(+), 8 deletions(-)
 create mode 100644 docshell/test/navigation/file_bug1300461.html
 create mode 100644 docshell/test/navigation/file_bug1300461_back.html
 create mode 100644 docshell/test/navigation/file_bug1300461_redirect.html
 create mode 100644 docshell/test/navigation/file_bug1300461_redirect.html^headers^

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7288de9bb256..2d946e680fc3 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11691,9 +11691,12 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel,
     AddURIVisit(aURI, referrer, previousURI, previousFlags, responseStatus);
   }
 
-  // If this was a history load or a refresh,
-  // update the index in SH.
-  if (rootSH && (mLoadType & (LOAD_CMD_HISTORY | LOAD_CMD_RELOAD))) {
+  // If this was a history load or a refresh, or it was a history load but
+  // later changed to LOAD_NORMAL_REPLACE due to redirection, update the index
+  // in session history.
+  if (rootSH &&
+       ((mLoadType & (LOAD_CMD_HISTORY | LOAD_CMD_RELOAD)) ||
+         mLoadType == LOAD_NORMAL_REPLACE)) {
     nsCOMPtr<nsISHistoryInternal> shInternal(do_QueryInterface(rootSH));
     if (shInternal) {
       rootSH->GetIndex(&mPreviousTransIndex);
@@ -12329,9 +12332,14 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
     // This is the root docshell
     bool addToSHistory = !LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY);
     if (!addToSHistory) {
-      // Replace current entry in session history.
+      // Replace current entry in session history; If the requested index is
+      // valid, it indicates the loading was triggered by a history load, and
+      // we should replace the entry at requested index instead.
       int32_t index = 0;
-      mSessionHistory->GetIndex(&index);
+      mSessionHistory->GetRequestedIndex(&index);
+      if (index == -1) {
+        mSessionHistory->GetIndex(&index);
+      }
       nsCOMPtr<nsISHistoryInternal> shPrivate =
         do_QueryInterface(mSessionHistory);
       // Replace the current entry with the new entry
diff --git a/docshell/test/navigation/file_bug1300461.html b/docshell/test/navigation/file_bug1300461.html
new file mode 100644
index 000000000000..1ba935046d7d
--- /dev/null
+++ b/docshell/test/navigation/file_bug1300461.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <title>Bug 1300461</title>
+  </head>
+  <body onload="test();">
+    <script>
+      /**
+       * Bug 1300461 identifies that if a history entry was not bfcached, and
+       * a http redirection happens when navigating to that entry, the history
+       * index would mess up.
+       *
+       * The test case emulates the circumstance by the following steps
+       * 1) Navigate to file_bug1300461_back.html which is not bf-cachable.
+       * 2) In file_bug1300461_back.html, replace its own history state to
+       *    file_bug1300461_redirect.html.
+       * 3) Back, and then forward. Since the document is not in bfcache, it
+       *    tries to load file_bug1300461_redirect.html directly.
+       * 4) file_bug1300461_redirect.html redirects UA to
+       *    file_bug1300461_back.html through HTTP 301 header.
+       *
+       * We verify the history index, canGoBack, canGoForward, etc. keep correct
+       * in this process.
+       */
+      let Ci = SpecialPowers.Ci;
+      let webNav = SpecialPowers.wrap(window)
+                     .QueryInterface(Ci.nsIInterfaceRequestor)
+                     .getInterface(Ci.nsIWebNavigation);
+      let shistory = webNav.sessionHistory;
+      let testSteps = [
+        function() {
+          opener.is(shistory.count, 1, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(!webNav.canGoForward, 'check canGoForward');
+          setTimeout(() => window.location = 'file_bug1300461_back.html', 0);
+        },
+        function() {
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(webNav.canGoForward, 'check canGoForward');
+          window.history.forward();
+          opener.is(shistory.requestedIndex, 1, 'check requestedIndex');
+        },
+        function() {
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(webNav.canGoForward, 'check canGoForward');
+          opener.info('file_bug1300461.html tests finished');
+          opener.nextTest();
+          window.close();
+        }
+      ];
+
+      function test() {
+        if (opener) {
+          opener.info('file_bug1300461.html test ' + opener.testCount);
+          testSteps[opener.testCount++]();
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/docshell/test/navigation/file_bug1300461_back.html b/docshell/test/navigation/file_bug1300461_back.html
new file mode 100644
index 000000000000..7b187742faeb
--- /dev/null
+++ b/docshell/test/navigation/file_bug1300461_back.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <title>Bug 1300461</title>
+  </head>
+  <!-- The empty unload handler is to prevent bfcache. -->
+  <body onload="test();" onunload="">
+    <script>
+      let Ci = SpecialPowers.Ci;
+      let webNav = SpecialPowers.wrap(window)
+                     .QueryInterface(Ci.nsIInterfaceRequestor)
+                     .getInterface(Ci.nsIWebNavigation);
+      let shistory = webNav.sessionHistory;
+      function test() {
+        if (opener) {
+          opener.info("file_bug1300461_back.html");
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 1, 'check history index');
+          opener.is(shistory.requestedIndex, -1, 'check requestedIndex');
+          opener.ok(webNav.canGoBack, 'check canGoBack');
+          if (opener.testCount == 1) {
+            opener.info('replaceState to redirect.html');
+            window.history.replaceState({}, '', 'file_bug1300461_redirect.html');
+          }
+          window.history.back();
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/docshell/test/navigation/file_bug1300461_redirect.html b/docshell/test/navigation/file_bug1300461_redirect.html
new file mode 100644
index 000000000000..979530c5cf5d
--- /dev/null
+++ b/docshell/test/navigation/file_bug1300461_redirect.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <title>Bug 1300461</title>
+  </head>
+  <body>
+    Redirect to file_bug1300461_back.html.
+  </body>
+</html>
diff --git a/docshell/test/navigation/file_bug1300461_redirect.html^headers^ b/docshell/test/navigation/file_bug1300461_redirect.html^headers^
new file mode 100644
index 000000000000..241b8918264e
--- /dev/null
+++ b/docshell/test/navigation/file_bug1300461_redirect.html^headers^
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: file_bug1300461_back.html
diff --git a/docshell/test/navigation/mochitest.ini b/docshell/test/navigation/mochitest.ini
index 9a807adeeadf..4000944db612 100644
--- a/docshell/test/navigation/mochitest.ini
+++ b/docshell/test/navigation/mochitest.ini
@@ -32,7 +32,11 @@ support-files =
   file_triggeringprincipal_iframe_iframe_window_open_frame_a.html
   file_triggeringprincipal_iframe_iframe_window_open_frame_b.html
   file_triggeringprincipal_iframe_iframe_window_open_frame_a_nav.html
-  
+  file_bug1300461.html
+  file_bug1300461_redirect.html
+  file_bug1300461_redirect.html^headers^
+  file_bug1300461_back.html
+
 [test_bug13871.html]
 skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' #RANDOM # Bug 1136180 disabled on B2G Desktop and Mulet for intermittent failures
 [test_bug270414.html]
diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html
index e4c0d18419ef..452271a41f23 100644
--- a/docshell/test/navigation/test_sessionhistory.html
+++ b/docshell/test/navigation/test_sessionhistory.html
@@ -30,7 +30,8 @@ var testFiles =
     "file_fragment_handling_during_load.html",
     "file_nested_frames.html",
     "file_shiftReload_and_pushState.html",
-    "file_scrollRestoration.html"
+    "file_scrollRestoration.html",
+    "file_bug1300461.html"
   ];
 var testCount = 0; // Used by the test files.
 
@@ -42,7 +43,7 @@ function nextTest_() {
   if (testFiles.length) {
     testCount = 0;
     testWindow = window.open(testFiles.shift(), "", "width=300,height=300");
-    testWindow.onunload = function () { } //XXX
+    testWindow.onunload = function () { } // to prevent bfcache
   } else {
     SimpleTest.finish();
   }

From 1d54633f83f82d8a865f05ac1341e55ad52b421b Mon Sep 17 00:00:00 2001
From: bechen <bechen@mozilla.com>
Date: Thu, 29 Sep 2016 17:47:35 +0800
Subject: [PATCH 23/57] Bug 1304948 - Part 1: Check the target cue belongs to
 corresponding TextTrack. r=rillian

MozReview-Commit-ID: 3X3FjYw2p26

--HG--
extra : rebase_source : 76a3e453d8edde947d7e32134121ba94e91c7a7e
---
 dom/media/TextTrack.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dom/media/TextTrack.cpp b/dom/media/TextTrack.cpp
index 3ff9536f82ad..2516bf47b154 100644
--- a/dom/media/TextTrack.cpp
+++ b/dom/media/TextTrack.cpp
@@ -150,9 +150,12 @@ TextTrack::AddCue(TextTrackCue& aCue)
 void
 TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv)
 {
-  aCue.SetActive(false);
-
+  // Bug1304948, check the aCue belongs to the TextTrack.
   mCueList->RemoveCue(aCue, aRv);
+  if (aRv.Failed()) {
+    return;
+  }
+  aCue.SetActive(false);
   aCue.SetTrack(nullptr);
   if (mTextTrackList) {
     HTMLMediaElement* mediaElement = mTextTrackList->GetMediaElement();

From 9a94b5158fb8ecb01dfff367e077fd67848e7311 Mon Sep 17 00:00:00 2001
From: bechen <bechen@mozilla.com>
Date: Thu, 29 Sep 2016 17:47:33 +0800
Subject: [PATCH 24/57] Bug 1304948 - Part 2: Don't run TimeMarchesOn when
 shutdown. r=rillian

MozReview-Commit-ID: AE6FE74ESHN

--HG--
extra : rebase_source : c6bd95af29d063c237e07c3fbdefb0daf76874f1
---
 dom/html/TextTrackManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/html/TextTrackManager.cpp b/dom/html/TextTrackManager.cpp
index f847cf3fca57..f138e686c224 100644
--- a/dom/html/TextTrackManager.cpp
+++ b/dom/html/TextTrackManager.cpp
@@ -589,8 +589,8 @@ TextTrackManager::TimeMarchesOn()
   WEBVTT_LOG("TimeMarchesOn");
   mTimeMarchesOnDispatched = false;
 
-  // Early return if we don't have any TextTracks.
-  if (!mTextTracks || mTextTracks->Length() == 0) {
+  // Early return if we don't have any TextTracks or shutting down.
+  if (!mTextTracks || mTextTracks->Length() == 0 || mShutdown) {
     return;
   }
 

From 8d4c4d713ca0d917ac70f0e75daf3e58e4db7134 Mon Sep 17 00:00:00 2001
From: bechen <bechen@mozilla.com>
Date: Thu, 29 Sep 2016 17:46:52 +0800
Subject: [PATCH 25/57] Bug 1304948 - Part 3: Add testcase. r=rillian

MozReview-Commit-ID: DHT8B5ULA1i

--HG--
extra : rebase_source : e880209682d8d16d8f10c5c85f6fe2ca1e503999
---
 dom/media/test/crashtests/1304948.html    | 33 +++++++++++++++++++++++
 dom/media/test/crashtests/crashtests.list |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 dom/media/test/crashtests/1304948.html

diff --git a/dom/media/test/crashtests/1304948.html b/dom/media/test/crashtests/1304948.html
new file mode 100644
index 000000000000..667a13d06aa4
--- /dev/null
+++ b/dom/media/test/crashtests/1304948.html
@@ -0,0 +1,33 @@
+<html class="reftest-wait">
+<head>
+  <title> Bug 1304948 : Crash if a texttrack remove a cue not belongs to it. </title>
+</head>
+<meta charset="utf-8">
+<script type="text/javascript">
+
+window.onload = function() {
+  var a = document.createElementNS('http://www.w3.org/1999/xhtml', 'video');
+  a.src = "";
+  document.body.appendChild(a);
+  var b = a.addTextTrack('chapters', "AAAAAAAAAAAAAAAA", "de");
+  var c = new VTTCue(0.6, 0.3, "AA");
+  b.addCue(c);
+  var d = document.createElementNS('http://www.w3.org/1999/xhtml', 'video');
+  var e = d.addTextTrack('chapters', "AAAA", "en-US");
+  a.currentTime = 2;
+  a.play();
+  try {
+    // This will queue a TimeMarchesOn task on mainthread, so use
+    // timer to wait the TimeMarchesOn crash.
+    e.removeCue(c);
+  } catch (e) {
+    if (e.name == "NotFoundError") {
+      setTimeout(function() {
+        document.documentElement.removeAttribute("class");}, 0);
+	  }
+  }
+};
+
+</script>
+</body>
+</html>
diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index 6fb76d46a81f..bdc5aa40fa42 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -82,6 +82,7 @@ skip-if(!B2G) load 1158427.html
 load 1185176.html
 load 1185192.html
 load 1228484.html
+load 1304948.html
 load analyser-channels-1.html
 load audiocontext-double-suspend.html
 load buffer-source-duration-1.html

From fb063cefc6ca2124cbb3d2bada2605caaf04902c Mon Sep 17 00:00:00 2001
From: Dimi Lee <dlee@mozilla.com>
Date: Wed, 14 Sep 2016 14:49:26 +0800
Subject: [PATCH 26/57] Bug 1305801 - Part 1: Implement variable length
 PrefixSet class for Safe Browsing v4. r=francois, r=gcp

MozReview-Commit-ID: 49XX1Gu1XqX

--HG--
extra : rebase_source : a4656dc0872e6c0a4aec2f60bc2c22ad668a4368
---
 toolkit/components/url-classifier/Entries.h   |   3 +
 .../VariableLengthPrefixSet.cpp               | 439 ++++++++++++++++++
 .../url-classifier/VariableLengthPrefixSet.h  |  70 +++
 toolkit/components/url-classifier/moz.build   |   2 +
 .../nsUrlClassifierPrefixSet.cpp              |  88 ++--
 .../url-classifier/nsUrlClassifierPrefixSet.h |  15 +
 6 files changed, 587 insertions(+), 30 deletions(-)
 create mode 100644 toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
 create mode 100644 toolkit/components/url-classifier/VariableLengthPrefixSet.h

diff --git a/toolkit/components/url-classifier/Entries.h b/toolkit/components/url-classifier/Entries.h
index 14bb133f8414..969f4f739b77 100644
--- a/toolkit/components/url-classifier/Entries.h
+++ b/toolkit/components/url-classifier/Entries.h
@@ -15,6 +15,7 @@
 #include "nsICryptoHash.h"
 #include "nsNetUtil.h"
 #include "nsIOutputStream.h"
+#include "nsClassHashtable.h"
 
 #if DEBUG
 #include "plbase64.h"
@@ -313,6 +314,8 @@ WriteTArray(nsIOutputStream* aStream, nsTArray_Impl<T, Alloc>& aArray)
                         &written);
 }
 
+typedef nsClassHashtable<nsUint32HashKey, nsCString> PrefixStringMap;
+
 } // namespace safebrowsing
 } // namespace mozilla
 
diff --git a/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp b/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
new file mode 100644
index 000000000000..02e07353d2ac
--- /dev/null
+++ b/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
@@ -0,0 +1,439 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#include "VariableLengthPrefixSet.h"
+#include "nsUrlClassifierPrefixSet.h"
+#include "nsPrintfCString.h"
+#include "nsThreadUtils.h"
+#include "mozilla/EndianUtils.h"
+#include "mozilla/Unused.h"
+#include <algorithm>
+
+// MOZ_LOG=UrlClassifierPrefixSet:5
+static mozilla::LazyLogModule gUrlClassifierPrefixSetLog("UrlClassifierPrefixSet");
+#define LOG(args) MOZ_LOG(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug, args)
+#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug)
+
+namespace mozilla {
+namespace safebrowsing {
+
+#define PREFIX_SIZE_FIXED 4
+
+NS_IMPL_ISUPPORTS(VariableLengthPrefixSet, nsIMemoryReporter)
+
+// Definition required due to std::max<>()
+const uint32_t VariableLengthPrefixSet::MAX_BUFFER_SIZE;
+
+// This class will process prefix size between 4~32. But for 4 bytes prefixes,
+// they will be passed to nsUrlClassifierPrefixSet because of better optimization.
+VariableLengthPrefixSet::VariableLengthPrefixSet()
+  : mLock("VariableLengthPrefixSet.mLock")
+  , mMemoryReportPath()
+{
+  mFixedPrefixSet = new nsUrlClassifierPrefixSet();
+}
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::Init(const nsACString& aName)
+{
+  mMemoryReportPath =
+    nsPrintfCString(
+      "explicit/storage/prefix-set/%s",
+      (!aName.IsEmpty() ? PromiseFlatCString(aName).get() : "?!")
+    );
+
+  RegisterWeakMemoryReporter(this);
+
+  return NS_OK;
+}
+
+VariableLengthPrefixSet::~VariableLengthPrefixSet()
+{
+  UnregisterWeakMemoryReporter(this);
+}
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::SetPrefixes(const PrefixStringMap& aPrefixMap)
+{
+  MutexAutoLock lock(mLock);
+
+  // Prefix size should not less than 4-bytes or greater than 32-bytes
+  for (auto iter = aPrefixMap.ConstIter(); !iter.Done(); iter.Next()) {
+    if (iter.Key() < PREFIX_SIZE_FIXED ||
+        iter.Key() > COMPLETE_SIZE) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  // Clear old prefixSet before setting new one.
+  mFixedPrefixSet->SetPrefixes(nullptr, 0);
+  mVLPrefixSet.Clear();
+
+  // 4-bytes prefixes are handled by nsUrlClassifierPrefixSet.
+  nsCString* prefixes = aPrefixMap.Get(PREFIX_SIZE_FIXED);
+  if (prefixes) {
+    NS_ENSURE_TRUE(prefixes->Length() % PREFIX_SIZE_FIXED == 0, NS_ERROR_FAILURE);
+
+    uint32_t numPrefixes = prefixes->Length() / PREFIX_SIZE_FIXED;
+
+#if MOZ_BIG_ENDIAN
+    const uint32_t* arrayPtr = reinterpret_cast<const uint32_t*>(prefixes->BeginReading());
+#else
+    FallibleTArray<uint32_t> array;
+    // Prefixes are lexicographically-sorted, so the interger array
+    // passed to nsUrlClassifierPrefixSet should also follow the same order.
+    // To make sure of that, we convert char array to integer with Big-Endian
+    // instead of casting to integer directly.
+    if (!array.SetCapacity(numPrefixes, fallible)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    const char* begin = prefixes->BeginReading();
+    const char* end = prefixes->EndReading();
+
+    while (begin != end) {
+      array.AppendElement(BigEndian::readUint32(begin), fallible);
+      begin += sizeof(uint32_t);
+    }
+
+    const uint32_t* arrayPtr = array.Elements();
+#endif
+
+    nsresult rv = mFixedPrefixSet->SetPrefixes(arrayPtr, numPrefixes);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // 5~32 bytes prefixes are stored in mVLPrefixSet.
+  for (auto iter = aPrefixMap.ConstIter(); !iter.Done(); iter.Next()) {
+    // Skip 4bytes prefixes because it is already stored in mFixedPrefixSet.
+    if (iter.Key() == PREFIX_SIZE_FIXED) {
+      continue;
+    }
+
+    mVLPrefixSet.Put(iter.Key(), new nsCString(*iter.Data()));
+  }
+
+  return NS_OK;
+}
+
+nsresult
+VariableLengthPrefixSet::GetPrefixes(PrefixStringMap& aPrefixMap)
+{
+  MutexAutoLock lock(mLock);
+
+  // 4-bytes prefixes are handled by nsUrlClassifierPrefixSet.
+  FallibleTArray<uint32_t> array;
+  nsresult rv = mFixedPrefixSet->GetPrefixesNative(array);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  size_t count = array.Length();
+  if (count) {
+    nsCString* prefixes = new nsCString();
+    prefixes->SetLength(PREFIX_SIZE_FIXED * count);
+
+    // Writing integer array to character array
+    uint32_t* begin = reinterpret_cast<uint32_t*>(prefixes->BeginWriting());
+    for (uint32_t i = 0; i < count; i++) {
+      begin[i] = NativeEndian::swapToBigEndian(array[i]);
+    }
+
+    aPrefixMap.Put(PREFIX_SIZE_FIXED, prefixes);
+  }
+
+  // Copy variable-length prefix set
+  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
+    aPrefixMap.Put(iter.Key(), new nsCString(*iter.Data()));
+  }
+
+  return NS_OK;
+}
+
+// It should never be the case that more than one hash prefixes match a given
+// full hash. However, if that happens, this method returns any one of them.
+// It does not guarantee which one of those will be returned.
+NS_IMETHODIMP
+VariableLengthPrefixSet::Matches(const nsACString& aFullHash, uint32_t* aLength)
+{
+  MutexAutoLock lock(mLock);
+
+  // Only allow full-length hash to check if match any of the prefix
+  MOZ_ASSERT(aFullHash.Length() == COMPLETE_SIZE);
+  NS_ENSURE_ARG_POINTER(aLength);
+
+  *aLength = 0;
+
+  // Check if it matches 4-bytes prefixSet first
+  const uint32_t* hash = reinterpret_cast<const uint32_t*>(aFullHash.BeginReading());
+  uint32_t value = BigEndian::readUint32(hash);
+
+  bool found = false;
+  nsresult rv = mFixedPrefixSet->Contains(value, &found);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (found) {
+    *aLength = PREFIX_SIZE_FIXED;
+    return NS_OK;
+  }
+
+  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
+    if (BinarySearch(aFullHash, *iter.Data(), iter.Key())) {
+      *aLength = iter.Key();
+      return NS_OK;
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::IsEmpty(bool* aEmpty)
+{
+  MutexAutoLock lock(mLock);
+
+  NS_ENSURE_ARG_POINTER(aEmpty);
+
+  mFixedPrefixSet->IsEmpty(aEmpty);
+  *aEmpty = *aEmpty && mVLPrefixSet.IsEmpty();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::LoadFromFile(nsIFile* aFile)
+{
+  MutexAutoLock lock(mLock);
+
+  NS_ENSURE_ARG_POINTER(aFile);
+
+  nsCOMPtr<nsIInputStream> localInFile;
+  nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(localInFile), aFile,
+                                           PR_RDONLY | nsIFile::OS_READAHEAD);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Calculate how big the file is, make sure our read buffer isn't bigger
+  // than the file itself which is just wasting memory.
+  int64_t fileSize;
+  rv = aFile->GetFileSize(&fileSize);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (fileSize < 0 || fileSize > UINT32_MAX) {
+    return NS_ERROR_FAILURE;
+  }
+
+  uint32_t bufferSize = std::min<uint32_t>(static_cast<uint32_t>(fileSize),
+                                           MAX_BUFFER_SIZE);
+
+  // Convert to buffered stream
+  nsCOMPtr<nsIInputStream> in = NS_BufferInputStream(localInFile, bufferSize);
+
+  rv = mFixedPrefixSet->LoadPrefixes(in);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = LoadPrefixes(in);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;;
+}
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::StoreToFile(nsIFile* aFile)
+{
+  NS_ENSURE_ARG_POINTER(aFile);
+
+  MutexAutoLock lock(mLock);
+
+  nsCOMPtr<nsIOutputStream> localOutFile;
+  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
+                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  uint32_t fileSize = 0;
+  // Preallocate the file storage
+  {
+    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
+
+    fileSize += mFixedPrefixSet->CalculatePreallocateSize();
+    fileSize += CalculatePreallocateSize();
+
+    Unused << fos->Preallocate(fileSize);
+  }
+
+  // Convert to buffered stream
+  nsCOMPtr<nsIOutputStream> out =
+    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
+
+  rv = mFixedPrefixSet->WritePrefixes(out);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = WritePrefixes(out);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+VariableLengthPrefixSet::LoadPrefixes(nsIInputStream* in)
+{
+  uint32_t magic;
+  uint32_t read;
+
+  nsresult rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
+
+  if (magic != PREFIXSET_VERSION_MAGIC) {
+    LOG(("Version magic mismatch, not loading"));
+    return NS_ERROR_FILE_CORRUPTED;
+  }
+
+  mVLPrefixSet.Clear();
+
+  uint32_t count;
+  rv = in->Read(reinterpret_cast<char*>(&count), sizeof(uint32_t), &read);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
+
+  for(;count > 0; count--) {
+    uint8_t prefixSize;
+    rv = in->Read(reinterpret_cast<char*>(&prefixSize), sizeof(uint8_t), &read);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(read == sizeof(uint8_t), NS_ERROR_FAILURE);
+
+    uint32_t stringLength;
+    rv = in->Read(reinterpret_cast<char*>(&stringLength), sizeof(uint32_t), &read);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
+
+    nsCString* vlPrefixes = new nsCString();
+    if (!vlPrefixes->SetLength(stringLength, fallible)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    rv = in->Read(reinterpret_cast<char*>(vlPrefixes->BeginWriting()), stringLength, &read);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(read == stringLength, NS_ERROR_FAILURE);
+
+    mVLPrefixSet.Put(prefixSize, vlPrefixes);
+  }
+
+  return NS_OK;
+}
+
+uint32_t
+VariableLengthPrefixSet::CalculatePreallocateSize()
+{
+  uint32_t fileSize = 0;
+
+  // Store how many prefix string.
+  fileSize += sizeof(uint32_t);
+
+  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
+    // Store prefix size, prefix string length, and prefix string.
+    fileSize += sizeof(uint8_t);
+    fileSize += sizeof(uint32_t);
+    fileSize += iter.Data()->Length();
+  }
+  return fileSize;
+}
+
+nsresult
+VariableLengthPrefixSet::WritePrefixes(nsIOutputStream* out)
+{
+  uint32_t written;
+  uint32_t writelen = sizeof(uint32_t);
+  uint32_t magic = PREFIXSET_VERSION_MAGIC;
+  nsresult rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
+
+  uint32_t count = mVLPrefixSet.Count();
+  rv = out->Write(reinterpret_cast<char*>(&count), writelen, &written);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
+
+  // Store PrefixSize, Length of Prefix String and then Prefix String
+  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
+    const nsCString& vlPrefixes = *iter.Data();
+
+    uint8_t prefixSize = iter.Key();
+    writelen = sizeof(uint8_t);
+    rv = out->Write(reinterpret_cast<char*>(&prefixSize), writelen, &written);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
+
+    uint32_t stringLength = vlPrefixes.Length();
+    writelen = sizeof(uint32_t);
+    rv = out->Write(reinterpret_cast<char*>(&stringLength), writelen, &written);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
+
+    rv = out->Write(const_cast<char*>(vlPrefixes.BeginReading()),
+                    stringLength, &written);
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_TRUE(stringLength == written, NS_ERROR_FAILURE);
+  }
+
+  return NS_OK;
+}
+
+bool
+VariableLengthPrefixSet::BinarySearch(const nsACString& aFullHash,
+                                         const nsACString& aPrefixes,
+                                         uint32_t aPrefixSize)
+{
+  const char* fullhash = aFullHash.BeginReading();
+  const char* prefixes = aPrefixes.BeginReading();
+  int32_t begin = 0, end = aPrefixes.Length() / aPrefixSize;
+
+  while (end >= begin) {
+    int32_t mid = (begin + end) >> 1;
+    int cmp = memcmp(fullhash, prefixes + mid*aPrefixSize, aPrefixSize);
+    if (cmp < 0) {
+      end = mid - 1;
+    } else if (cmp > 0) {
+      begin = mid + 1;
+    } else {
+      return true;
+    }
+  }
+  return false;
+}
+
+MOZ_DEFINE_MALLOC_SIZE_OF(UrlClassifierMallocSizeOf)
+
+NS_IMETHODIMP
+VariableLengthPrefixSet::CollectReports(nsIHandleReportCallback* aHandleReport,
+                                           nsISupports* aData, bool aAnonymize)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  size_t amount = SizeOfIncludingThis(UrlClassifierMallocSizeOf);
+
+  return aHandleReport->Callback(
+    EmptyCString(), mMemoryReportPath, KIND_HEAP, UNITS_BYTES, amount,
+    NS_LITERAL_CSTRING("Memory used by the variable-length prefix set for a URL classifier."),
+    aData);
+}
+
+size_t
+VariableLengthPrefixSet::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
+{
+  MutexAutoLock lock(mLock);
+
+  size_t n = 0;
+  n += aMallocSizeOf(this);
+  n += mFixedPrefixSet->SizeOfIncludingThis(moz_malloc_size_of) - aMallocSizeOf(mFixedPrefixSet);
+
+  n += mVLPrefixSet.ShallowSizeOfExcludingThis(aMallocSizeOf);
+  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
+    n += iter.Data()->SizeOfExcludingThisIfUnshared(aMallocSizeOf);
+  }
+
+  return n;
+}
+
+} // namespace safebrowsing
+} // namespace mozilla
diff --git a/toolkit/components/url-classifier/VariableLengthPrefixSet.h b/toolkit/components/url-classifier/VariableLengthPrefixSet.h
new file mode 100644
index 000000000000..eca214885547
--- /dev/null
+++ b/toolkit/components/url-classifier/VariableLengthPrefixSet.h
@@ -0,0 +1,70 @@
+//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef VariableLengthPrefixSet_h
+#define VariableLengthPrefixSet_h
+
+#include "nsISupports.h"
+#include "nsIMemoryReporter.h"
+#include "Entries.h"
+#include "nsTArray.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Mutex.h"
+
+class nsUrlClassifierPrefixSet;
+
+namespace mozilla {
+namespace safebrowsing {
+
+class VariableLengthPrefixSet final
+  : public nsIMemoryReporter
+{
+public:
+  VariableLengthPrefixSet();
+
+  NS_IMETHOD Init(const nsACString& aName);
+  NS_IMETHOD SetPrefixes(const mozilla::safebrowsing::PrefixStringMap& aPrefixMap);
+  NS_IMETHOD GetPrefixes(mozilla::safebrowsing::PrefixStringMap& aPrefixMap);
+  NS_IMETHOD Matches(const nsACString& aFullHash, uint32_t* aLength);
+  NS_IMETHOD IsEmpty(bool* aEmpty);
+  NS_IMETHOD LoadFromFile(nsIFile* aFile);
+  NS_IMETHOD StoreToFile(nsIFile* aFile);
+
+  size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);
+
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIMEMORYREPORTER
+
+private:
+  virtual ~VariableLengthPrefixSet();
+
+  static const uint32_t MAX_BUFFER_SIZE = 64 * 1024;
+  static const uint32_t PREFIXSET_VERSION_MAGIC = 1;
+
+  bool BinarySearch(const nsACString& aFullHash,
+                    const nsACString& aPrefixes,
+                    uint32_t aPrefixSize);
+
+  uint32_t CalculatePreallocateSize();
+  nsresult WritePrefixes(nsIOutputStream* out);
+  nsresult LoadPrefixes(nsIInputStream* in);
+
+  // Lock to prevent races between the url-classifier thread (which does most
+  // of the operations) and the main thread (which does memory reporting).
+  // It should be held for all operations between Init() and destruction that
+  // touch this class's data members.
+  mozilla::Mutex mLock;
+
+  RefPtr<nsUrlClassifierPrefixSet> mFixedPrefixSet;
+  mozilla::safebrowsing::PrefixStringMap mVLPrefixSet;
+
+  nsCString mMemoryReportPath;
+};
+
+} // namespace safebrowsing
+} // namespace mozilla
+
+#endif
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
index acf89e5ef343..4be366afbb06 100644
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -36,6 +36,7 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'nsUrlClassifierPrefixSet.cpp',
     'nsUrlClassifierStreamUpdater.cpp',
+    'VariableLengthPrefixSet.cpp',
 ]
 
 # contains variables that conflict with LookupCache.cpp
@@ -63,6 +64,7 @@ EXPORTS += [
     'LookupCache.h',
     'nsUrlClassifierPrefixSet.h',
     'protobuf/safebrowsing.pb.h',
+    'VariableLengthPrefixSet.h',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
index ad70dd7de200..87456547036c 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
@@ -338,10 +338,55 @@ nsUrlClassifierPrefixSet::LoadFromFile(nsIFile* aFile)
   // Convert to buffered stream
   nsCOMPtr<nsIInputStream> in = NS_BufferInputStream(localInFile, bufferSize);
 
+  rv = LoadPrefixes(in);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlClassifierPrefixSet::StoreToFile(nsIFile* aFile)
+{
+  MutexAutoLock lock(mLock);
+
+  nsCOMPtr<nsIOutputStream> localOutFile;
+  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
+                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  uint32_t fileSize;
+
+  // Preallocate the file storage
+  {
+    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
+    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_FALLOCATE_TIME> timer;
+
+    fileSize = CalculatePreallocateSize();
+
+    // Ignore failure, the preallocation is a hint and we write out the entire
+    // file later on
+    Unused << fos->Preallocate(fileSize);
+  }
+
+  // Convert to buffered stream
+  nsCOMPtr<nsIOutputStream> out =
+    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
+
+  rv = WritePrefixes(out);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  LOG(("Saving PrefixSet successful\n"));
+
+  return NS_OK;
+}
+
+nsresult
+nsUrlClassifierPrefixSet::LoadPrefixes(nsIInputStream* in)
+{
   uint32_t magic;
   uint32_t read;
 
-  rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
+  nsresult rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
 
@@ -411,40 +456,23 @@ nsUrlClassifierPrefixSet::LoadFromFile(nsIFile* aFile)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsUrlClassifierPrefixSet::StoreToFile(nsIFile* aFile)
+uint32_t
+nsUrlClassifierPrefixSet::CalculatePreallocateSize()
 {
-  MutexAutoLock lock(mLock);
-
-  nsCOMPtr<nsIOutputStream> localOutFile;
-  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
-                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t fileSize;
-
-  // Preallocate the file storage
-  {
-    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
-    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_FALLOCATE_TIME> timer;
-    fileSize = 4 * sizeof(uint32_t);
-    uint32_t deltas = mTotalPrefixes - mIndexPrefixes.Length();
-    fileSize += 2 * mIndexPrefixes.Length() * sizeof(uint32_t);
-    fileSize += deltas * sizeof(uint16_t);
-
-    // Ignore failure, the preallocation is a hint and we write out the entire
-    // file later on
-    Unused << fos->Preallocate(fileSize);
-  }
-
-  // Convert to buffered stream
-  nsCOMPtr<nsIOutputStream> out =
-    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
+  uint32_t fileSize = 4 * sizeof(uint32_t);
+  uint32_t deltas = mTotalPrefixes - mIndexPrefixes.Length();
+  fileSize += 2 * mIndexPrefixes.Length() * sizeof(uint32_t);
+  fileSize += deltas * sizeof(uint16_t);
+  return fileSize;
+}
 
+nsresult
+nsUrlClassifierPrefixSet::WritePrefixes(nsIOutputStream* out)
+{
   uint32_t written;
   uint32_t writelen = sizeof(uint32_t);
   uint32_t magic = PREFIXSET_VERSION_MAGIC;
-  rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
+  nsresult rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
 
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
index 90163a2f8a4a..8627b75d0c7f 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
@@ -12,6 +12,7 @@
 #include "nsIFile.h"
 #include "nsIMemoryReporter.h"
 #include "nsIMutableArray.h"
+#include "nsIFileStreams.h"
 #include "nsIUrlClassifierPrefixSet.h"
 #include "nsTArray.h"
 #include "nsToolkitCompsCID.h"
@@ -19,6 +20,14 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Mutex.h"
 
+namespace mozilla {
+namespace safebrowsing {
+
+class VariableLengthPrefixSet;
+
+} // namespace safebrowsing
+} // namespace mozilla
+
 class nsUrlClassifierPrefixSet final
   : public nsIUrlClassifierPrefixSet
   , public nsIMemoryReporter
@@ -41,6 +50,8 @@ public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIMEMORYREPORTER
 
+  friend class mozilla::safebrowsing::VariableLengthPrefixSet;
+
 private:
   virtual ~nsUrlClassifierPrefixSet();
 
@@ -52,6 +63,10 @@ private:
   nsresult MakePrefixSet(const uint32_t* aArray, uint32_t aLength);
   uint32_t BinSearch(uint32_t start, uint32_t end, uint32_t target);
 
+  uint32_t CalculatePreallocateSize();
+  nsresult WritePrefixes(nsIOutputStream* out);
+  nsresult LoadPrefixes(nsIInputStream* in);
+
   // Lock to prevent races between the url-classifier thread (which does most
   // of the operations) and the main thread (which does memory reporting).
   // It should be held for all operations between Init() and destruction that

From 55a866eaa17e35b19c73fe2302ec73af5803abce Mon Sep 17 00:00:00 2001
From: Dimi Lee <dlee@mozilla.com>
Date: Tue, 27 Sep 2016 14:26:09 -0700
Subject: [PATCH 27/57] Bug 1305801 - Part 2: Add telemetry for variable-length
 prefix set. r=francois

MozReview-Commit-ID: 8SebDJ8ZeKn

--HG--
extra : rebase_source : 069a6279fad396b50d180743395541bebe3f3c7a
---
 toolkit/components/telemetry/Histograms.json   | 18 ++++++++++++++++++
 .../url-classifier/VariableLengthPrefixSet.cpp |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 5a5c48de0333..96c0a022d6ce 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3764,6 +3764,24 @@
     "n_buckets": 15,
     "description": "Time spent constructing PrefixSet from DB (ms)"
   },
+  "URLCLASSIFIER_VLPS_FILELOAD_TIME": {
+    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
+    "expires_in_version": "58",
+    "kind": "exponential",
+    "high": 1000,
+    "n_buckets": 10,
+    "bug_numbers": [1283007],
+    "description": "Time spent loading Variable-Length PrefixSet from file (ms)"
+  },
+  "URLCLASSIFIER_VLPS_FALLOCATE_TIME": {
+    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
+    "expires_in_version": "58",
+    "kind": "exponential",
+    "high": 1000,
+    "n_buckets": 10,
+    "bug_numbers": [1283007],
+    "description": "Time spent fallocating Variable-Length PrefixSet (ms)"
+  },
   "URLCLASSIFIER_LC_PREFIXES": {
     "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
     "expires_in_version": "never",
diff --git a/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp b/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
index 02e07353d2ac..5b6a7b0a3fa3 100644
--- a/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
+++ b/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
@@ -9,6 +9,7 @@
 #include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
 #include "mozilla/EndianUtils.h"
+#include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include <algorithm>
 
@@ -208,6 +209,8 @@ VariableLengthPrefixSet::LoadFromFile(nsIFile* aFile)
 
   NS_ENSURE_ARG_POINTER(aFile);
 
+  Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_VLPS_FILELOAD_TIME> timer;
+
   nsCOMPtr<nsIInputStream> localInFile;
   nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(localInFile), aFile,
                                            PR_RDONLY | nsIFile::OS_READAHEAD);
@@ -254,6 +257,7 @@ VariableLengthPrefixSet::StoreToFile(nsIFile* aFile)
   // Preallocate the file storage
   {
     nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
+    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_VLPS_FALLOCATE_TIME> timer;
 
     fileSize += mFixedPrefixSet->CalculatePreallocateSize();
     fileSize += CalculatePreallocateSize();

From b3889409ed09e52cbcb2858acfd817d9c2284c46 Mon Sep 17 00:00:00 2001
From: Dimi Lee <dlee@mozilla.com>
Date: Wed, 14 Sep 2016 14:49:41 +0800
Subject: [PATCH 28/57] Bug 1305801 - Part 3: Testcase for variable length
 prefixSet. r=francois, r=gcp

MozReview-Commit-ID: Gy7LtQ11EkV

--HG--
extra : rebase_source : dffe478b8dec6a00532b5c5a888df8e9db6daa6f
---
 .../gtest/TestVariableLengthPrefixSet.cpp     | 559 ++++++++++++++++++
 .../url-classifier/tests/gtest/moz.build      |   1 +
 2 files changed, 560 insertions(+)
 create mode 100644 toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp

diff --git a/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp b/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp
new file mode 100644
index 000000000000..9e380a9d360f
--- /dev/null
+++ b/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp
@@ -0,0 +1,559 @@
+/* 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/. */
+
+#include <mozilla/RefPtr.h>
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsClassHashtable.h"
+#include "VariableLengthPrefixSet.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsIFile.h"
+#include "gtest/gtest.h"
+
+using namespace mozilla::safebrowsing;
+
+typedef nsCString _Prefix;
+typedef nsTArray<_Prefix> _PrefixArray;
+
+// Create fullhash by appending random characters.
+static nsCString* CreateFullHash(const nsACString& in)
+{
+  nsCString* out = new nsCString(in);
+  out->SetLength(32);
+  for (size_t i = in.Length(); i < 32; i++) {
+    out->SetCharAt(char(rand() % 256), i);
+  }
+
+  return out;
+}
+
+// This function generate N prefixes with size between MIN and MAX.
+// The output array will not be cleared, random result will append to it
+static void RandomPrefixes(uint32_t N, uint32_t MIN, uint32_t MAX, _PrefixArray& array)
+{
+  array.SetCapacity(array.Length() + N);
+
+  uint32_t range = (MAX - MIN + 1);
+
+  for (uint32_t i = 0; i < N; i++) {
+    uint32_t prefixSize = (rand() % range) + MIN;
+    _Prefix prefix;
+    prefix.SetLength(prefixSize);
+
+    bool added = false;
+    while(!added) {
+      char* dst = prefix.BeginWriting();
+      for (uint32_t j = 0; j < prefixSize; j++) {
+        dst[j] = rand() % 256;
+      }
+
+      if (!array.Contains(prefix)) {
+        array.AppendElement(prefix);
+        added = true;
+      }
+    }
+  }
+}
+
+static void CheckContent(VariableLengthPrefixSet* pset,
+                         PrefixStringMap& expected)
+{
+  PrefixStringMap vlPSetMap;
+  pset->GetPrefixes(vlPSetMap);
+
+  for (auto iter = vlPSetMap.Iter(); !iter.Done(); iter.Next()) {
+    nsCString* expectedPrefix = expected.Get(iter.Key());
+    nsCString* resultPrefix = iter.Data();
+
+    ASSERT_TRUE(resultPrefix->Equals(*expectedPrefix));
+  }
+}
+
+// This test loops through all the prefixes and converts each prefix to
+// fullhash by appending random characters, each converted fullhash
+// should at least match its original length in the prefixSet.
+static void DoExpectedLookup(VariableLengthPrefixSet* pset,
+                             _PrefixArray& array)
+{
+  uint32_t matchLength = 0;
+  for (uint32_t i = 0; i < array.Length(); i++) {
+    const nsCString& prefix = array[i];
+    UniquePtr<nsCString> fullhash(CreateFullHash(prefix));
+
+    // Find match for prefix-generated full hash
+    pset->Matches(*fullhash, &matchLength);
+    MOZ_ASSERT(matchLength != 0);
+
+    if (matchLength != prefix.Length()) {
+      // Return match size is not the same as prefix size.
+      // In this case it could be because the generated fullhash match other
+      // prefixes, check if this prefix exist.
+      bool found = false;
+
+      for (uint32_t j = 0; j < array.Length(); j++) {
+        if (array[j].Length() != matchLength) {
+          continue;
+        }
+
+        if (0 == memcmp(fullhash->BeginReading(),
+                        array[j].BeginReading(),
+                        matchLength)) {
+          found = true;
+          break;
+        }
+      }
+      ASSERT_TRUE(found);
+    }
+  }
+}
+
+static void DoRandomLookup(VariableLengthPrefixSet* pset,
+                           uint32_t N,
+                           _PrefixArray& array)
+{
+  for (uint32_t i = 0; i < N; i++) {
+    // Random 32-bytes test fullhash
+    char buf[32];
+    for (uint32_t j = 0; j < 32; j++) {
+      buf[j] = (char)(rand() % 256);
+    }
+
+    // Get the expected result.
+    nsTArray<uint32_t> expected;
+    for (uint32_t j = 0; j < array.Length(); j++) {
+      const nsACString& str = array[j];
+      if (0 == memcmp(buf, str.BeginReading(), str.Length())) {
+        expected.AppendElement(str.Length());
+      }
+    }
+
+    uint32_t matchLength = 0;
+    pset->Matches(nsDependentCSubstring(buf, 32), &matchLength);
+
+    ASSERT_TRUE(expected.IsEmpty() ? !matchLength : expected.Contains(matchLength));
+  }
+}
+
+static void SetupPrefixMap(const _PrefixArray& array,
+                             PrefixStringMap& map)
+{
+  map.Clear();
+
+  // Buckets are keyed by prefix length and contain an array of
+  // all prefixes of that length.
+  nsClassHashtable<nsUint32HashKey, _PrefixArray> table;
+
+  for (uint32_t i = 0; i < array.Length(); i++) {
+    _PrefixArray* prefixes = table.Get(array[i].Length());
+    if (!prefixes) {
+      prefixes = new _PrefixArray();
+      table.Put(array[i].Length(), prefixes);
+    }
+
+    prefixes->AppendElement(array[i]);
+  }
+
+  // The resulting map entries will be a concatenation of all
+  // prefix data for the prefixes of a given size.
+  for (auto iter = table.Iter(); !iter.Done(); iter.Next()) {
+    uint32_t size = iter.Key();
+    uint32_t count = iter.Data()->Length();
+
+    _Prefix* str = new _Prefix();
+    str->SetLength(size * count);
+
+    char* dst = str->BeginWriting();
+
+    iter.Data()->Sort();
+    for (uint32_t i = 0; i < count; i++) {
+      memcpy(dst, iter.Data()->ElementAt(i).get(), size);
+      dst += size;
+    }
+
+    map.Put(size, str);
+  }
+}
+
+
+// Test setting prefix set with only 4-bytes prefixes
+TEST(VariableLengthPrefixSet, FixedLengthSet)
+{
+  srand(time(nullptr));
+
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  PrefixStringMap map;
+  _PrefixArray array = { _Prefix("alph"), _Prefix("brav"), _Prefix("char"),
+                         _Prefix("delt"), _Prefix("echo"), _Prefix("foxt"),
+                       };
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+
+  // Run random test
+  array.Clear();
+  map.Clear();
+
+  RandomPrefixes(1500, 4, 4, array);
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+}
+
+// Test setting prefix set with only 5~32 bytes prefixes
+TEST(VariableLengthPrefixSet, VariableLengthSet)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  PrefixStringMap map;
+  _PrefixArray array = { _Prefix("bravo"), _Prefix("charlie"), _Prefix("delta"),
+                         _Prefix("EchoEchoEchoEchoEcho"), _Prefix("foxtrot"),
+                         _Prefix("GolfGolfGolfGolfGolfGolfGolfGolf"),
+                         _Prefix("hotel"), _Prefix("november"),
+                         _Prefix("oscar"), _Prefix("quebec"), _Prefix("romeo"),
+                         _Prefix("sierrasierrasierrasierrasierra"),
+                         _Prefix("Tango"), _Prefix("whiskey"), _Prefix("yankee"),
+                         _Prefix("ZuluZuluZuluZulu")
+                       };
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+
+  // Run random test
+  array.Clear();
+  map.Clear();
+
+  RandomPrefixes(1500, 5, 32, array);
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+
+}
+
+// Test setting prefix set with both 4-bytes prefixes and 5~32 bytes prefixes
+TEST(VariableLengthPrefixSet, MixedPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  PrefixStringMap map;
+  _PrefixArray array = { _Prefix("enus"), _Prefix("apollo"), _Prefix("mars"),
+                         _Prefix("Hecatonchires cyclopes"),
+                         _Prefix("vesta"), _Prefix("neptunus"), _Prefix("jupiter"),
+                         _Prefix("diana"), _Prefix("minerva"), _Prefix("ceres"),
+                         _Prefix("Aidos,Adephagia,Adikia,Aletheia"),
+                         _Prefix("hecatonchires"), _Prefix("alcyoneus"), _Prefix("hades"),
+                         _Prefix("vulcanus"), _Prefix("juno"), _Prefix("mercury"),
+                         _Prefix("Stheno, Euryale and Medusa")
+                       };
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+
+  // Run random test
+  array.Clear();
+  map.Clear();
+
+  RandomPrefixes(1500, 4, 32, array);
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+}
+
+// Test resetting prefix set
+TEST(VariableLengthPrefixSet, ResetPrefix)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  // First prefix set
+  _PrefixArray array1 = { _Prefix("Iceland"), _Prefix("Peru"), _Prefix("Mexico"),
+                          _Prefix("Australia"), _Prefix("Japan"), _Prefix("Egypt"),
+                          _Prefix("America"), _Prefix("Finland"), _Prefix("Germany"),
+                          _Prefix("Italy"), _Prefix("France"), _Prefix("Taiwan"),
+                        };
+  {
+    PrefixStringMap map;
+
+    SetupPrefixMap(array1, map);
+    pset->SetPrefixes(map);
+
+    DoExpectedLookup(pset, array1);
+  }
+
+  // Second
+  _PrefixArray array2 = { _Prefix("Pikachu"), _Prefix("Bulbasaur"), _Prefix("Charmander"),
+                          _Prefix("Blastoise"), _Prefix("Pidgey"), _Prefix("Mewtwo"),
+                          _Prefix("Jigglypuff"), _Prefix("Persian"), _Prefix("Tentacool"),
+                          _Prefix("Onix"), _Prefix("Eevee"), _Prefix("Jynx"),
+                        };
+  {
+    PrefixStringMap map;
+
+    SetupPrefixMap(array2, map);
+    pset->SetPrefixes(map);
+
+    DoExpectedLookup(pset, array2);
+  }
+
+  // Should not match any of the first prefix set
+  uint32_t matchLength = 0;
+  for (uint32_t i = 0; i < array1.Length(); i++) {
+    UniquePtr<nsACString> fullhash(CreateFullHash(array1[i]));
+
+    pset->Matches(*fullhash, &matchLength);
+    ASSERT_TRUE(matchLength == 0);
+  }
+}
+
+// Test only set one 4-bytes prefix and one full-length prefix
+TEST(VariableLengthPrefixSet, TinyPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  PrefixStringMap map;
+  _PrefixArray array = { _Prefix("AAAA"),
+                         _Prefix("11112222333344445555666677778888"),
+                       };
+
+  SetupPrefixMap(array, map);
+  pset->SetPrefixes(map);
+
+  DoExpectedLookup(pset, array);
+
+  DoRandomLookup(pset, 1000, array);
+
+  CheckContent(pset, map);
+}
+
+// Test empty prefix set and IsEmpty function
+TEST(VariableLengthPrefixSet, EmptyPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  bool empty;
+  pset->IsEmpty(&empty);
+  ASSERT_TRUE(empty);
+
+  PrefixStringMap map;
+  _PrefixArray array1;
+
+  // Lookup an empty array should never match
+  DoRandomLookup(pset, 100, array1);
+
+  // Insert an 4-bytes prefix, then IsEmpty should return false
+  _PrefixArray array2 = { _Prefix("test") };
+  SetupPrefixMap(array2, map);
+  pset->SetPrefixes(map);
+
+  pset->IsEmpty(&empty);
+  ASSERT_TRUE(!empty);
+
+  _PrefixArray array3 = { _Prefix("test variable length") };
+
+  // Insert an 5~32 bytes prefix, then IsEmpty should return false
+  SetupPrefixMap(array3, map);
+  pset->SetPrefixes(map);
+
+  pset->IsEmpty(&empty);
+  ASSERT_TRUE(!empty);
+}
+
+// Test prefix size should only between 4~32 bytes
+TEST(VariableLengthPrefixSet, MinMaxPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
+  pset->Init(NS_LITERAL_CSTRING("test"));
+
+  PrefixStringMap map;
+  {
+    _PrefixArray array = { _Prefix("1234"),
+                           _Prefix("ABCDEFGHIJKKMNOP"),
+                           _Prefix("1aaa2bbb3ccc4ddd5eee6fff7ggg8hhh") };
+
+    SetupPrefixMap(array, map);
+    nsresult rv = pset->SetPrefixes(map);
+    ASSERT_TRUE(rv == NS_OK);
+  }
+
+  // Prefix size less than 4-bytes should fail
+  {
+    _PrefixArray array = { _Prefix("123") };
+
+    SetupPrefixMap(array, map);
+    nsresult rv = pset->SetPrefixes(map);
+    ASSERT_TRUE(NS_FAILED(rv));
+  }
+
+  // Prefix size greater than 32-bytes should fail
+  {
+    _PrefixArray array = { _Prefix("1aaa2bbb3ccc4ddd5eee6fff7ggg8hhh9") };
+
+    SetupPrefixMap(array, map);
+    nsresult rv = pset->SetPrefixes(map);
+    ASSERT_TRUE(NS_FAILED(rv));
+  }
+}
+
+// Test save then load prefix set with only 4-bytes prefixes
+TEST(VariableLengthPrefixSet, LoadSaveFixedLengthPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
+  save->Init(NS_LITERAL_CSTRING("test-save"));
+
+  _PrefixArray array;
+  RandomPrefixes(10000, 4, 4, array);
+
+  PrefixStringMap map;
+  SetupPrefixMap(array, map);
+  save->SetPrefixes(map);
+
+  DoExpectedLookup(save, array);
+
+  DoRandomLookup(save, 1000, array);
+
+  CheckContent(save, map);
+
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+  file->Append(NS_LITERAL_STRING("test.vlpset"));
+
+  save->StoreToFile(file);
+
+  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
+  load->Init(NS_LITERAL_CSTRING("test-load"));
+
+  load->LoadFromFile(file);
+
+  DoExpectedLookup(load, array);
+
+  DoRandomLookup(load, 1000, array);
+
+  CheckContent(load, map);
+
+  file->Remove(false);
+}
+
+// Test save then load prefix set with only 5~32 bytes prefixes
+TEST(VariableLengthPrefixSet, LoadSaveVariableLengthPrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
+  save->Init(NS_LITERAL_CSTRING("test-save"));
+
+  _PrefixArray array;
+  RandomPrefixes(10000, 5, 32, array);
+
+  PrefixStringMap map;
+  SetupPrefixMap(array, map);
+  save->SetPrefixes(map);
+
+  DoExpectedLookup(save, array);
+
+  DoRandomLookup(save, 1000, array);
+
+  CheckContent(save, map);
+
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+  file->Append(NS_LITERAL_STRING("test.vlpset"));
+
+  save->StoreToFile(file);
+
+  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
+  load->Init(NS_LITERAL_CSTRING("test-load"));
+
+  load->LoadFromFile(file);
+
+  DoExpectedLookup(load, array);
+
+  DoRandomLookup(load, 1000, array);
+
+  CheckContent(load, map);
+
+  file->Remove(false);
+}
+
+// Test save then load prefix with both 4 bytes prefixes and 5~32 bytes prefixes
+TEST(VariableLengthPrefixSet, LoadSavePrefixSet)
+{
+  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
+  save->Init(NS_LITERAL_CSTRING("test-save"));
+
+  // Try to simulate the real case that most prefixes are 4bytes
+  _PrefixArray array;
+  RandomPrefixes(20000, 4, 4, array);
+  RandomPrefixes(1000, 5, 32, array);
+
+  PrefixStringMap map;
+  SetupPrefixMap(array, map);
+  save->SetPrefixes(map);
+
+  DoExpectedLookup(save, array);
+
+  DoRandomLookup(save, 1000, array);
+
+  CheckContent(save, map);
+
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+  file->Append(NS_LITERAL_STRING("test.vlpset"));
+
+  save->StoreToFile(file);
+
+  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
+  load->Init(NS_LITERAL_CSTRING("test-load"));
+
+  load->LoadFromFile(file);
+
+  DoExpectedLookup(load, array);
+
+  DoRandomLookup(load, 1000, array);
+
+  CheckContent(load, map);
+
+  file->Remove(false);
+}
diff --git a/toolkit/components/url-classifier/tests/gtest/moz.build b/toolkit/components/url-classifier/tests/gtest/moz.build
index 39f216446e85..2f03afbe87e2 100644
--- a/toolkit/components/url-classifier/tests/gtest/moz.build
+++ b/toolkit/components/url-classifier/tests/gtest/moz.build
@@ -15,6 +15,7 @@ UNIFIED_SOURCES += [
     'TestSafeBrowsingProtobuf.cpp',
     'TestTable.cpp',
     'TestUrlClassifierUtils.cpp',
+    'TestVariableLengthPrefixSet.cpp',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'

From f0aab4a2ce11cc683aa950efe543b5ab10a47edb Mon Sep 17 00:00:00 2001
From: Dimi Lee <dlee@mozilla.com>
Date: Mon, 19 Sep 2016 11:51:01 +0800
Subject: [PATCH 29/57] Bug 1305801 - Part 4: Store variable-length prefix to
 disk. r=francois, r=gcp

MozReview-Commit-ID: BMTGtgMuQdg

--HG--
extra : rebase_source : 6f613883071de209f53596060b637e928f458978
---
 .../components/url-classifier/Classifier.cpp  |  98 ++++-
 .../components/url-classifier/Classifier.h    |   3 +
 toolkit/components/url-classifier/HashStore.h |   4 +
 .../components/url-classifier/LookupCache.cpp | 385 +++++++++++-------
 .../components/url-classifier/LookupCache.h   | 126 +++++-
 .../url-classifier/ProtocolParser.cpp         |   2 +
 .../tests/gtest/TestPerProviderDirectory.cpp  |   6 +-
 .../gtest/TestUrlClassifierTableUpdateV4.cpp  | 190 +++++++++
 .../url-classifier/tests/gtest/moz.build      |   1 +
 9 files changed, 619 insertions(+), 196 deletions(-)
 create mode 100644 toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp

diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp
index 99d52c4f074a..c675d54b8ae1 100644
--- a/toolkit/components/url-classifier/Classifier.cpp
+++ b/toolkit/components/url-classifier/Classifier.cpp
@@ -517,17 +517,6 @@ Classifier::ApplyUpdates(nsTArray<TableUpdate*>* aUpdates)
   {
     ScopedUpdatesClearer scopedUpdatesClearer(aUpdates);
 
-    // In order to prevent any premature update code from being
-    // run against V4 updates, we bail out as early as possible
-    // if aUpdates is using V4.
-    for (auto update : *aUpdates) {
-      if (update && TableUpdate::Cast<TableUpdateV4>(update)) {
-        LOG(("V4 update is not supported yet."));
-        // TODO: Bug 1283009 - Supports applying table udpate V4.
-        return NS_ERROR_NOT_IMPLEMENTED;
-      }
-    }
-
     LOG(("Backup before update."));
 
     rv = BackupTables();
@@ -540,7 +529,13 @@ Classifier::ApplyUpdates(nsTArray<TableUpdate*>* aUpdates)
       if ((*aUpdates)[i]) {
         // Run all updates for one table
         nsCString updateTable(aUpdates->ElementAt(i)->TableName());
-        rv = UpdateHashStore(aUpdates, updateTable);
+
+        if (TableUpdate::Cast<TableUpdateV2>((*aUpdates)[i])) {
+          rv = UpdateHashStore(aUpdates, updateTable);
+        } else {
+          rv = UpdateTableV4(aUpdates, updateTable);
+        }
+
         if (NS_FAILED(rv)) {
           if (rv != NS_ERROR_OUT_OF_MEMORY) {
             Reset();
@@ -857,7 +852,8 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Read the part of the store that is (only) in the cache
-  LookupCache *lookupCache = GetLookupCache(store.TableName());
+  LookupCacheV2* lookupCache =
+    LookupCache::Cast<LookupCacheV2>(GetLookupCache(store.TableName()));
   if (!lookupCache) {
     return NS_ERROR_FAILURE;
   }
@@ -922,7 +918,7 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   NS_ENSURE_SUCCESS(rv, rv);
 
 #if defined(DEBUG)
-  lookupCache->Dump();
+  lookupCache->DumpCompletions();
 #endif
   rv = lookupCache->WriteFile();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -934,6 +930,62 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   return NS_OK;
 }
 
+nsresult
+Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
+                          const nsACString& aTable)
+{
+  LOG(("Classifier::UpdateTableV4(%s)", PromiseFlatCString(aTable).get()));
+
+  if (!CheckValidUpdate(aUpdates, aTable)) {
+    return NS_OK;
+  }
+
+  LookupCacheV4* lookupCache =
+    LookupCache::Cast<LookupCacheV4>(GetLookupCache(aTable));
+  if (!lookupCache) {
+    return NS_ERROR_FAILURE;
+  }
+
+  PrefixStringMap prefixes;
+  for (uint32_t i = 0; i < aUpdates->Length(); i++) {
+    TableUpdate *update = aUpdates->ElementAt(i);
+    if (!update || !update->TableName().Equals(aTable)) {
+      continue;
+    }
+
+    auto updateV4 = TableUpdate::Cast<TableUpdateV4>(update);
+    NS_ENSURE_TRUE(updateV4, NS_ERROR_FAILURE);
+
+    if (updateV4->IsFullUpdate()) {
+      prefixes.Clear();
+      TableUpdateV4::PrefixesStringMap& map = updateV4->Prefixes();
+
+      for (auto iter = map.Iter(); !iter.Done(); iter.Next()) {
+        // prefixes is an nsClassHashtable object stores prefix string.
+        // It will take the ownership of the put object.
+        nsCString* prefix = new nsCString(iter.Data()->GetPrefixString());
+        prefixes.Put(iter.Key(), prefix);
+      }
+    } else {
+      // TODO: Bug 1287058, partial update
+    }
+
+    aUpdates->ElementAt(i) = nullptr;
+  }
+
+  nsresult rv = lookupCache->Build(prefixes);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = lookupCache->WriteFile();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  int64_t now = (PR_Now() / PR_USEC_PER_SEC);
+  LOG(("Successfully updated %s\n", PromiseFlatCString(aTable).get()));
+  mTableFreshness.Put(aTable, now);
+
+  return NS_OK;
+}
+
 nsresult
 Classifier::UpdateCache(TableUpdate* aUpdate)
 {
@@ -945,7 +997,9 @@ Classifier::UpdateCache(TableUpdate* aUpdate)
   LOG(("Classifier::UpdateCache(%s)", table.get()));
 
   LookupCache *lookupCache = GetLookupCache(table);
-  NS_ENSURE_TRUE(lookupCache, NS_ERROR_FAILURE);
+  if (!lookupCache) {
+    return NS_ERROR_FAILURE;
+  }
 
   auto updateV2 = TableUpdate::Cast<TableUpdateV2>(aUpdate);
   lookupCache->AddCompletionsToCache(updateV2->AddCompletes());
@@ -966,7 +1020,16 @@ Classifier::GetLookupCache(const nsACString& aTable)
     }
   }
 
-  UniquePtr<LookupCache> cache(new LookupCache(aTable, mRootStoreDirectory));
+  // TODO : Bug 1302600, It would be better if we have a more general non-main
+  //        thread method to convert table name to protocol version. Currently
+  //        we can only know this by checking if the table name ends with '-proto'.
+  UniquePtr<LookupCache> cache;
+  if (StringEndsWith(aTable, NS_LITERAL_CSTRING("-proto"))) {
+    cache = MakeUnique<LookupCacheV4>(aTable, mRootStoreDirectory);
+  } else {
+    cache = MakeUnique<LookupCacheV2>(aTable, mRootStoreDirectory);
+  }
+
   nsresult rv = cache->Init();
   if (NS_FAILED(rv)) {
     return nullptr;
@@ -988,7 +1051,8 @@ Classifier::ReadNoiseEntries(const Prefix& aPrefix,
                              uint32_t aCount,
                              PrefixArray* aNoiseEntries)
 {
-  LookupCache *cache = GetLookupCache(aTableName);
+  // TODO : Bug 1297962, support adding noise for v4
+  LookupCacheV2 *cache = static_cast<LookupCacheV2*>(GetLookupCache(aTableName));
   if (!cache) {
     return NS_ERROR_FAILURE;
   }
diff --git a/toolkit/components/url-classifier/Classifier.h b/toolkit/components/url-classifier/Classifier.h
index e11b8d0acbb4..712d62589462 100644
--- a/toolkit/components/url-classifier/Classifier.h
+++ b/toolkit/components/url-classifier/Classifier.h
@@ -115,6 +115,9 @@ private:
   nsresult UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
                            const nsACString& aTable);
 
+  nsresult UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
+                         const nsACString& aTable);
+
   nsresult UpdateCache(TableUpdate* aUpdates);
 
   LookupCache *GetLookupCache(const nsACString& aTable);
diff --git a/toolkit/components/url-classifier/HashStore.h b/toolkit/components/url-classifier/HashStore.h
index 1288b8db35c4..1796ea9a33ea 100644
--- a/toolkit/components/url-classifier/HashStore.h
+++ b/toolkit/components/url-classifier/HashStore.h
@@ -153,6 +153,7 @@ public:
 public:
   explicit TableUpdateV4(const nsACString& aTable)
     : TableUpdate(aTable)
+    , mFullUpdate(false)
   {
   }
 
@@ -161,18 +162,21 @@ public:
     return mPrefixesMap.IsEmpty() && mRemovalIndiceArray.IsEmpty();
   }
 
+  bool IsFullUpdate() const { return mFullUpdate; }
   PrefixesStringMap& Prefixes() { return mPrefixesMap; }
   RemovalIndiceArray& RemovalIndices() { return mRemovalIndiceArray; }
 
   // For downcasting.
   static const int TAG = 4;
 
+  void SetFullUpdate(bool aIsFullUpdate) { mFullUpdate = aIsFullUpdate; }
   void NewPrefixes(int32_t aSize, std::string& aPrefixes);
   void NewRemovalIndices(const uint32_t* aIndices, size_t aNumOfIndices);
 
 private:
   virtual int Tag() const override { return TAG; }
 
+  bool mFullUpdate;
   PrefixesStringMap mPrefixesMap;
   RemovalIndiceArray mRemovalIndiceArray;
 };
diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp
index 98e334db1e7d..cbb7b8141d18 100644
--- a/toolkit/components/url-classifier/LookupCache.cpp
+++ b/toolkit/components/url-classifier/LookupCache.cpp
@@ -40,6 +40,9 @@ extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
 namespace mozilla {
 namespace safebrowsing {
 
+const int LookupCacheV2::VER = 2;
+const int LookupCacheV4::VER = 4;
+
 LookupCache::LookupCache(const nsACString& aTableName, nsIFile* aRootStoreDir)
   : mPrimed(false)
   , mTableName(aTableName)
@@ -48,29 +51,11 @@ LookupCache::LookupCache(const nsACString& aTableName, nsIFile* aRootStoreDir)
   UpdateRootDirHandle(mRootStoreDirectory);
 }
 
-nsresult
-LookupCache::Init()
-{
-  mPrefixSet = new nsUrlClassifierPrefixSet();
-  nsresult rv = mPrefixSet->Init(mTableName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-LookupCache::~LookupCache()
-{
-}
-
 nsresult
 LookupCache::Open()
 {
-  LOG(("Reading Completions"));
-  nsresult rv = ReadCompletions();
-  NS_ENSURE_SUCCESS(rv, rv);
-
   LOG(("Loading PrefixSet"));
-  rv = LoadPrefixSet();
+  nsresult rv = LoadPrefixSet();
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -125,32 +110,6 @@ LookupCache::Reset()
   return NS_OK;
 }
 
-
-nsresult
-LookupCache::Build(AddPrefixArray& aAddPrefixes,
-                   AddCompleteArray& aAddCompletes)
-{
-  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_COMPLETIONS,
-                        static_cast<uint32_t>(aAddCompletes.Length()));
-
-  mUpdateCompletions.Clear();
-  mUpdateCompletions.SetCapacity(aAddCompletes.Length());
-  for (uint32_t i = 0; i < aAddCompletes.Length(); i++) {
-    mUpdateCompletions.AppendElement(aAddCompletes[i].CompleteHash());
-  }
-  aAddCompletes.Clear();
-  mUpdateCompletions.Sort();
-
-  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_PREFIXES,
-                        static_cast<uint32_t>(aAddPrefixes.Length()));
-
-  nsresult rv = ConstructPrefixSet(aAddPrefixes);
-  NS_ENSURE_SUCCESS(rv, rv);
-  mPrimed = true;
-
-  return NS_OK;
-}
-
 nsresult
 LookupCache::AddCompletionsToCache(AddCompleteArray& aAddCompletes)
 {
@@ -177,50 +136,8 @@ LookupCache::DumpCache()
     LOG(("Caches: %s", str.get()));
   }
 }
-
-void
-LookupCache::Dump()
-{
-  if (!LOG_ENABLED())
-    return;
-
-  for (uint32_t i = 0; i < mUpdateCompletions.Length(); i++) {
-    nsAutoCString str;
-    mUpdateCompletions[i].ToHexString(str);
-    LOG(("Update: %s", str.get()));
-  }
-}
 #endif
 
-nsresult
-LookupCache::Has(const Completion& aCompletion,
-                 bool* aHas, bool* aComplete)
-{
-  *aHas = *aComplete = false;
-
-  uint32_t prefix = aCompletion.ToUint32();
-
-  bool found;
-  nsresult rv = mPrefixSet->Contains(prefix, &found);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  LOG(("Probe in %s: %X, found %d", mTableName.get(), prefix, found));
-
-  if (found) {
-    *aHas = true;
-  }
-
-  // TODO: We may need to distinguish completions found in cache or update in the future
-  if ((mGetHashCache.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex) ||
-      (mUpdateCompletions.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex)) {
-    LOG(("Complete in %s", mTableName.get()));
-    *aComplete = true;
-    *aHas = true;
-  }
-
-  return NS_OK;
-}
-
 nsresult
 LookupCache::WriteFile()
 {
@@ -231,7 +148,7 @@ LookupCache::WriteFile()
   rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mPrefixSet->StoreToFile(psFile);
+  rv = StoreToFile(psFile);
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "failed to store the prefixset");
 
   return NS_OK;
@@ -241,41 +158,16 @@ void
 LookupCache::ClearAll()
 {
   ClearCache();
-  ClearUpdatedCompletions();
-  mPrefixSet->SetPrefixes(nullptr, 0);
+  ClearPrefixes();
   mPrimed = false;
 }
 
-void
-LookupCache::ClearUpdatedCompletions()
-{
-  mUpdateCompletions.Clear();
-}
-
 void
 LookupCache::ClearCache()
 {
   mGetHashCache.Clear();
 }
 
-nsresult
-LookupCache::ReadCompletions()
-{
-  HashStore store(mTableName, mRootStoreDirectory);
-
-  nsresult rv = store.Open();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mUpdateCompletions.Clear();
-
-  const AddCompleteArray& addComplete = store.AddCompletes();
-  for (uint32_t i = 0; i < addComplete.Length(); i++) {
-    mUpdateCompletions.AppendElement(addComplete[i].complete);
-  }
-
-  return NS_OK;
-}
-
 /* static */ bool
 LookupCache::IsCanonicalizedIP(const nsACString& aHost)
 {
@@ -452,9 +344,178 @@ LookupCache::GetHostKeys(const nsACString& aSpec,
   return NS_OK;
 }
 
-bool LookupCache::IsPrimed()
+nsresult
+LookupCache::LoadPrefixSet()
 {
-  return mPrimed;
+  nsCOMPtr<nsIFile> psFile;
+  nsresult rv = mStoreDirectory->Clone(getter_AddRefs(psFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool exists;
+  rv = psFile->Exists(&exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (exists) {
+    LOG(("stored PrefixSet exists, loading from disk"));
+    rv = LoadFromFile(psFile);
+    if (NS_FAILED(rv)) {
+      if (rv == NS_ERROR_FILE_CORRUPTED) {
+        Reset();
+      }
+      return rv;
+    }
+    mPrimed = true;
+  } else {
+    LOG(("no (usable) stored PrefixSet found"));
+  }
+
+#ifdef DEBUG
+  if (mPrimed) {
+    uint32_t size = SizeOfPrefixSet();
+    LOG(("SB tree done, size = %d bytes\n", size));
+  }
+#endif
+
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV2::Init()
+{
+  mPrefixSet = new nsUrlClassifierPrefixSet();
+  nsresult rv = mPrefixSet->Init(mTableName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV2::Open()
+{
+  nsresult rv = LookupCache::Open();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  LOG(("Reading Completions"));
+  rv = ReadCompletions();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+void
+LookupCacheV2::ClearAll()
+{
+  LookupCache::ClearAll();
+  mUpdateCompletions.Clear();
+}
+
+nsresult
+LookupCacheV2::Has(const Completion& aCompletion,
+                   bool* aHas, bool* aComplete)
+{
+  *aHas = *aComplete = false;
+
+  uint32_t prefix = aCompletion.ToUint32();
+
+  bool found;
+  nsresult rv = mPrefixSet->Contains(prefix, &found);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  LOG(("Probe in %s: %X, found %d", mTableName.get(), prefix, found));
+
+  if (found) {
+    *aHas = true;
+  }
+
+  if ((mGetHashCache.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex) ||
+      (mUpdateCompletions.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex)) {
+    LOG(("Complete in %s", mTableName.get()));
+    *aComplete = true;
+    *aHas = true;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV2::Build(AddPrefixArray& aAddPrefixes,
+                     AddCompleteArray& aAddCompletes)
+{
+  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_COMPLETIONS,
+                        static_cast<uint32_t>(aAddCompletes.Length()));
+
+  mUpdateCompletions.Clear();
+  mUpdateCompletions.SetCapacity(aAddCompletes.Length());
+  for (uint32_t i = 0; i < aAddCompletes.Length(); i++) {
+    mUpdateCompletions.AppendElement(aAddCompletes[i].CompleteHash());
+  }
+  aAddCompletes.Clear();
+  mUpdateCompletions.Sort();
+
+  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_PREFIXES,
+                        static_cast<uint32_t>(aAddPrefixes.Length()));
+
+  nsresult rv = ConstructPrefixSet(aAddPrefixes);
+  NS_ENSURE_SUCCESS(rv, rv);
+  mPrimed = true;
+
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV2::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
+{
+  if (!mPrimed) {
+    // This can happen if its a new table, so no error.
+    LOG(("GetPrefixes from empty LookupCache"));
+    return NS_OK;
+  }
+  return mPrefixSet->GetPrefixesNative(aAddPrefixes);
+}
+
+nsresult
+LookupCacheV2::ReadCompletions()
+{
+  HashStore store(mTableName, mRootStoreDirectory);
+
+  nsresult rv = store.Open();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mUpdateCompletions.Clear();
+
+  const AddCompleteArray& addComplete = store.AddCompletes();
+  for (uint32_t i = 0; i < addComplete.Length(); i++) {
+    mUpdateCompletions.AppendElement(addComplete[i].complete);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV2::ClearPrefixes()
+{
+  return mPrefixSet->SetPrefixes(nullptr, 0);
+}
+
+nsresult
+LookupCacheV2::StoreToFile(nsIFile* aFile)
+{
+  return mPrefixSet->StoreToFile(aFile);
+}
+
+nsresult
+LookupCacheV2::LoadFromFile(nsIFile* aFile)
+{
+  return mPrefixSet->LoadFromFile(aFile);
+}
+
+size_t
+LookupCacheV2::SizeOfPrefixSet()
+{
+  return mPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
 }
 
 #ifdef DEBUG
@@ -478,7 +539,7 @@ static void EnsureSorted(T* aArray)
 #endif
 
 nsresult
-LookupCache::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
+LookupCacheV2::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
 {
   Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_CONSTRUCT_TIME> timer;
 
@@ -512,55 +573,71 @@ LookupCache::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
   return NS_OK;
 }
 
-nsresult
-LookupCache::LoadPrefixSet()
+#if defined(DEBUG)
+void
+LookupCacheV2::DumpCompletions()
 {
-  nsCOMPtr<nsIFile> psFile;
-  nsresult rv = mStoreDirectory->Clone(getter_AddRefs(psFile));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (!LOG_ENABLED())
+    return;
 
-  rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool exists;
-  rv = psFile->Exists(&exists);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (exists) {
-    LOG(("stored PrefixSet exists, loading from disk"));
-    rv = mPrefixSet->LoadFromFile(psFile);
-    if (NS_FAILED(rv)) {
-      if (rv == NS_ERROR_FILE_CORRUPTED) {
-        Reset();
-      }
-      return rv;
-    }
-    mPrimed = true;
-  } else {
-    LOG(("no (usable) stored PrefixSet found"));
-  }
-
-#ifdef DEBUG
-  if (mPrimed) {
-    uint32_t size = mPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
-    LOG(("SB tree done, size = %d bytes\n", size));
+  for (uint32_t i = 0; i < mUpdateCompletions.Length(); i++) {
+    nsAutoCString str;
+    mUpdateCompletions[i].ToHexString(str);
+    LOG(("Update: %s", str.get()));
   }
+}
 #endif
 
+nsresult
+LookupCacheV4::Init()
+{
+  mVLPrefixSet = new VariableLengthPrefixSet();
+  nsresult rv = mVLPrefixSet->Init(mTableName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   return NS_OK;
 }
 
+// TODO : Bug 1298257, Implement url matching for variable-length prefix set
 nsresult
-LookupCache::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
+LookupCacheV4::Has(const Completion& aCompletion,
+                   bool* aHas, bool* aComplete)
 {
-  if (!mPrimed) {
-    // This can happen if its a new table, so no error.
-    LOG(("GetPrefixes from empty LookupCache"));
-    return NS_OK;
-  }
-  return mPrefixSet->GetPrefixesNative(aAddPrefixes);
+  *aHas = false;
+  return NS_OK;
 }
 
+nsresult
+LookupCacheV4::Build(PrefixStringMap& aPrefixMap)
+{
+  return mVLPrefixSet->SetPrefixes(aPrefixMap);
+}
+
+nsresult
+LookupCacheV4::ClearPrefixes()
+{
+  // Clear by seting a empty map
+  PrefixStringMap map;
+  return mVLPrefixSet->SetPrefixes(map);
+}
+
+nsresult
+LookupCacheV4::StoreToFile(nsIFile* aFile)
+{
+  return mVLPrefixSet->StoreToFile(aFile);
+}
+
+nsresult
+LookupCacheV4::LoadFromFile(nsIFile* aFile)
+{
+  return mVLPrefixSet->LoadFromFile(aFile);
+}
+
+size_t
+LookupCacheV4::SizeOfPrefixSet()
+{
+  return mVLPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
+}
 
 } // namespace safebrowsing
 } // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h
index 6b64c8bae486..91c24da422b6 100644
--- a/toolkit/components/url-classifier/LookupCache.h
+++ b/toolkit/components/url-classifier/LookupCache.h
@@ -14,6 +14,7 @@
 #include "nsIFileStreams.h"
 #include "mozilla/RefPtr.h"
 #include "nsUrlClassifierPrefixSet.h"
+#include "VariableLengthPrefixSet.h"
 #include "mozilla/Logging.h"
 
 namespace mozilla {
@@ -96,50 +97,58 @@ public:
                               nsTArray<nsCString>* aHostKeys);
 
   LookupCache(const nsACString& aTableName, nsIFile* aStoreFile);
-  ~LookupCache();
+  virtual ~LookupCache() {}
 
   const nsCString &TableName() const { return mTableName; }
 
-  nsresult Init();
-  nsresult Open();
   // The directory handle where we operate will
   // be moved away when a backup is made.
   nsresult UpdateRootDirHandle(nsIFile* aRootStoreDirectory);
+
   // This will Clear() the passed arrays when done.
-  nsresult Build(AddPrefixArray& aAddPrefixes,
-                 AddCompleteArray& aAddCompletes);
   nsresult AddCompletionsToCache(AddCompleteArray& aAddCompletes);
-  nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
-  void ClearUpdatedCompletions();
+
+  // Write data stored in lookup cache to disk.
+  nsresult WriteFile();
+
+  // Clear completions retrieved from gethash request.
   void ClearCache();
 
+  bool IsPrimed() const { return mPrimed; };
+
 #if DEBUG
   void DumpCache();
-  void Dump();
 #endif
-  nsresult WriteFile();
-  nsresult Has(const Completion& aCompletion,
-               bool* aHas, bool* aComplete);
-  bool IsPrimed();
+
+  virtual nsresult Open();
+  virtual nsresult Init() = 0;
+  virtual nsresult ClearPrefixes() = 0;
+  virtual nsresult Has(const Completion& aCompletion,
+                       bool* aHas, bool* aComplete) = 0;
+
+  template<typename T>
+  static T* Cast(LookupCache* aThat) {
+    return (T::VER == aThat->Ver() ? reinterpret_cast<T*>(aThat) : nullptr);
+  }
 
 private:
-  void ClearAll();
   nsresult Reset();
-  nsresult ReadCompletions();
   nsresult LoadPrefixSet();
-  nsresult LoadCompletions();
-  // Construct a Prefix Set with known prefixes.
-  // This will Clear() aAddPrefixes when done.
-  nsresult ConstructPrefixSet(AddPrefixArray& aAddPrefixes);
+
+  virtual nsresult StoreToFile(nsIFile* aFile) = 0;
+  virtual nsresult LoadFromFile(nsIFile* aFile) = 0;
+  virtual size_t SizeOfPrefixSet() = 0;
+
+  virtual int Ver() const = 0;
+
+protected:
+  virtual void ClearAll();
 
   bool mPrimed;
   nsCString mTableName;
   nsCOMPtr<nsIFile> mRootStoreDirectory;
   nsCOMPtr<nsIFile> mStoreDirectory;
-  // Set of prefixes known to be in the database
-  RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
-  // Full length hashes obtained in update request
-  CompletionArray mUpdateCompletions;
+
   // Full length hashes obtained in gethash request
   CompletionArray mGetHashCache;
 
@@ -147,6 +156,79 @@ private:
   friend class PerProviderDirectoryTestUtils;
 };
 
+class LookupCacheV2 final : public LookupCache
+{
+public:
+  explicit LookupCacheV2(const nsACString& aTableName, nsIFile* aStoreFile)
+    : LookupCache(aTableName, aStoreFile) {}
+  ~LookupCacheV2() {}
+
+  virtual nsresult Init() override;
+  virtual nsresult Open() override;
+  virtual void ClearAll() override;
+  virtual nsresult Has(const Completion& aCompletion,
+                       bool* aHas, bool* aComplete) override;
+
+  nsresult Build(AddPrefixArray& aAddPrefixes,
+                 AddCompleteArray& aAddCompletes);
+
+  nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
+
+#if DEBUG
+  void DumpCompletions();
+#endif
+
+  static const int VER;
+
+protected:
+  nsresult ReadCompletions();
+
+  virtual nsresult ClearPrefixes() override;
+  virtual nsresult StoreToFile(nsIFile* aFile) override;
+  virtual nsresult LoadFromFile(nsIFile* aFile) override;
+  virtual size_t SizeOfPrefixSet() override;
+
+private:
+  virtual int Ver() const override { return VER; }
+
+  // Construct a Prefix Set with known prefixes.
+  // This will Clear() aAddPrefixes when done.
+  nsresult ConstructPrefixSet(AddPrefixArray& aAddPrefixes);
+
+  // Full length hashes obtained in update request
+  CompletionArray mUpdateCompletions;
+
+  // Set of prefixes known to be in the database
+  RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
+};
+
+class LookupCacheV4 final : public LookupCache
+{
+public:
+  explicit LookupCacheV4(const nsACString& aTableName, nsIFile* aStoreFile)
+    : LookupCache(aTableName, aStoreFile) {}
+  ~LookupCacheV4() {}
+
+  virtual nsresult Init() override;
+  virtual nsresult Has(const Completion& aCompletion,
+                       bool* aHas, bool* aComplete) override;
+
+  nsresult Build(PrefixStringMap& aPrefixMap);
+
+  static const int VER;
+
+protected:
+  virtual nsresult ClearPrefixes() override;
+  virtual nsresult StoreToFile(nsIFile* aFile) override;
+  virtual nsresult LoadFromFile(nsIFile* aFile) override;
+  virtual size_t SizeOfPrefixSet() override;
+
+private:
+  virtual int Ver() const override { return VER; }
+
+  RefPtr<VariableLengthPrefixSet> mVLPrefixSet;
+};
+
 } // namespace safebrowsing
 } // namespace mozilla
 
diff --git a/toolkit/components/url-classifier/ProtocolParser.cpp b/toolkit/components/url-classifier/ProtocolParser.cpp
index 38dfea96da3d..0f83aa23f461 100644
--- a/toolkit/components/url-classifier/ProtocolParser.cpp
+++ b/toolkit/components/url-classifier/ProtocolParser.cpp
@@ -873,6 +873,8 @@ ProtocolParserProtobuf::ProcessOneResponse(const ListUpdateResponse& aResponse)
   PARSER_LOG(("* listName: %s\n", listName.get()));
   PARSER_LOG(("* newState: %s\n", aResponse.new_client_state().c_str()));
   PARSER_LOG(("* isFullUpdate: %s\n", (isFullUpdate ? "yes" : "no")));
+
+  tuV4->SetFullUpdate(isFullUpdate);
   ProcessAdditionOrRemoval(*tuV4, aResponse.additions(), true /*aIsAddition*/);
   ProcessAdditionOrRemoval(*tuV4, aResponse.removals(), false);
   PARSER_LOG(("\n\n"));
diff --git a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
index 64e2a81d4f7f..0a22baebf530 100644
--- a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
+++ b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
@@ -81,12 +81,12 @@ TEST(PerProviderDirectory, LookupCache)
 
     // For V2 tables (NOT ending with '-proto'), root directory should be
     // used as the private store.
-    VerifyPrivateStorePath<LookupCache>("goog-phish-shavar", "google", rootDir, false);
+    VerifyPrivateStorePath<LookupCacheV2>("goog-phish-shavar", "google", rootDir, false);
 
     // For V4 tables, if provider is found, use per-provider subdirectory;
     // If not found, use root directory.
-    VerifyPrivateStorePath<LookupCache>("goog-noprovider-proto", "", rootDir, false);
-    VerifyPrivateStorePath<LookupCache>("goog-phish-proto", "google4", rootDir, true);
+    VerifyPrivateStorePath<LookupCacheV4>("goog-noprovider-proto", "", rootDir, false);
+    VerifyPrivateStorePath<LookupCacheV4>("goog-phish-proto", "google4", rootDir, true);
   });
 }
 
diff --git a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
new file mode 100644
index 000000000000..3db815f47b91
--- /dev/null
+++ b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
@@ -0,0 +1,190 @@
+#include "Classifier.h"
+#include "HashStore.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsIFile.h"
+#include "nsIThread.h"
+#include "string.h"
+#include "gtest/gtest.h"
+
+using namespace mozilla;
+using namespace mozilla::safebrowsing;
+
+typedef nsCString _Prefix;
+typedef nsTArray<_Prefix> _PrefixArray;
+
+static void
+PrefixArrayToPrefixStringMap(const _PrefixArray& prefixArray,
+                             PrefixStringMap& outMap)
+{
+  outMap.Clear();
+
+  for (uint32_t i = 0; i < prefixArray.Length(); i++) {
+    const _Prefix& prefix = prefixArray[i];
+    nsCString* prefixString = outMap.LookupOrAdd(prefix.Length());
+    prefixString->Append(prefix.BeginReading(), prefix.Length());
+  }
+}
+
+// N: Number of prefixes, MIN/MAX: minimum/maximum prefix size
+// This function will append generated prefixes to outArray.
+// All elements in the generated array will be different.
+static void
+CreateRandomSortedPrefixArray(uint32_t N,
+                              uint32_t MIN,
+                              uint32_t MAX,
+                              _PrefixArray& outArray)
+{
+  outArray.SetCapacity(outArray.Length() + N);
+
+  const uint32_t range = (MAX - MIN + 1);
+
+  for (uint32_t i = 0; i < N; i++) {
+    uint32_t prefixSize = (rand() % range) + MIN;
+    _Prefix prefix;
+    prefix.SetLength(prefixSize);
+
+    while (true) {
+      char* dst = prefix.BeginWriting();
+      for (uint32_t j = 0; j < prefixSize; j++) {
+        dst[j] = rand() % 256;
+      }
+
+      if (!outArray.Contains(prefix)) {
+        outArray.AppendElement(prefix);
+        break;
+      }
+    }
+  }
+
+  outArray.Sort();
+}
+
+// Function to generate TableUpdateV4.
+static void
+GenerateUpdateData(bool fullUpdate,
+                   PrefixStringMap& add,
+                   nsTArray<uint32_t>& removal,
+                   nsTArray<TableUpdate*>& tableUpdates)
+{
+  TableUpdateV4* tableUpdate = new TableUpdateV4(NS_LITERAL_CSTRING("gtest-malware-proto"));
+  tableUpdate->SetFullUpdate(fullUpdate);
+
+  for (auto iter = add.ConstIter(); !iter.Done(); iter.Next()) {
+    nsCString* pstring = iter.Data();
+    std::string str(pstring->BeginReading(), pstring->Length());
+
+    tableUpdate->NewPrefixes(iter.Key(), str);
+  }
+
+  tableUpdate->NewRemovalIndices(removal.Elements(), removal.Length());
+
+  tableUpdates.AppendElement(tableUpdate);
+}
+
+static void
+VerifyPrefixSet(PrefixStringMap& expected)
+{
+  // Verify the prefix set is written to disk.
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+
+  file->AppendRelativeNativePath(NS_LITERAL_CSTRING("safebrowsing/gtest-malware-proto.pset"));
+
+  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
+  load->Init(NS_LITERAL_CSTRING("gtest-malware-proto"));
+
+  PrefixStringMap out;
+  load->LoadFromFile(file);
+  load->GetPrefixes(out);
+
+  for (auto iter = expected.ConstIter(); !iter.Done(); iter.Next()) {
+    nsCString* str1 = iter.Data();
+    nsCString* str2 = out.Get(iter.Key());
+
+    ASSERT_TRUE(*str1 == *str2);
+  }
+}
+
+static void
+Clear()
+{
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+  file->AppendRelativeNativePath(NS_LITERAL_CSTRING("safebrowsing/gtest-malware-proto.pset"));
+  file->Remove(false);
+}
+
+static void
+testUpdate(nsTArray<TableUpdate*>& tableUpdates,
+           PrefixStringMap& expected)
+{
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+
+  UniquePtr<Classifier> classifier(new Classifier());
+  classifier->Open(*file);
+
+  RunTestInNewThread([&] () -> void {
+    nsresult rv = classifier->ApplyUpdates(&tableUpdates);
+    ASSERT_TRUE(rv == NS_OK);
+
+    VerifyPrefixSet(expected);
+  });
+}
+
+static void
+testFullUpdate(PrefixStringMap& add)
+{
+  nsTArray<uint32_t> empty;
+  nsTArray<TableUpdate*> tableUpdates;
+  GenerateUpdateData(true, add, empty, tableUpdates);
+
+  testUpdate(tableUpdates, add);
+}
+
+TEST(UrlClassifierTableUpdateV4, FixLenghtPSetFullUpdate)
+{
+  srand(time(NULL));
+
+   _PrefixArray array;
+  PrefixStringMap map;
+
+  CreateRandomSortedPrefixArray(5000, 4, 4, array);
+  PrefixArrayToPrefixStringMap(array, map);
+
+  testFullUpdate(map);
+
+  Clear();
+}
+
+
+TEST(UrlClassifierTableUpdateV4, VariableLenghtPSetFullUpdate)
+{
+   _PrefixArray array;
+  PrefixStringMap map;
+
+  CreateRandomSortedPrefixArray(5000, 5, 32, array);
+  PrefixArrayToPrefixStringMap(array, map);
+
+  testFullUpdate(map);
+
+  Clear();
+}
+
+// This test contain both variable length prefix set and fixed-length prefix set
+TEST(UrlClassifierTableUpdateV4, MixedPSetFullUpdate)
+{
+   _PrefixArray array;
+  PrefixStringMap map;
+
+  CreateRandomSortedPrefixArray(5000, 4, 4, array);
+  CreateRandomSortedPrefixArray(1000, 5, 32, array);
+  PrefixArrayToPrefixStringMap(array, map);
+
+  testFullUpdate(map);
+
+  Clear();
+}
diff --git a/toolkit/components/url-classifier/tests/gtest/moz.build b/toolkit/components/url-classifier/tests/gtest/moz.build
index 2f03afbe87e2..5e4d66a9a79e 100644
--- a/toolkit/components/url-classifier/tests/gtest/moz.build
+++ b/toolkit/components/url-classifier/tests/gtest/moz.build
@@ -14,6 +14,7 @@ UNIFIED_SOURCES += [
     'TestSafebrowsingHash.cpp',
     'TestSafeBrowsingProtobuf.cpp',
     'TestTable.cpp',
+    'TestUrlClassifierTableUpdateV4.cpp',
     'TestUrlClassifierUtils.cpp',
     'TestVariableLengthPrefixSet.cpp',
 ]

From cc4fd28b8e603bccadcc0f293e3f679de1ad58cb Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 2 Oct 2016 11:41:47 -0700
Subject: [PATCH 30/57] Backed out changeset d64bcb6d78e5 (bug 1205371) for
 browser_animation_pseudo_elements.js and
 browser_markup_dragdrop_invalidNodes.js failures

---
 devtools/client/inspector/markup/markup.js    | 26 +-----
 devtools/client/inspector/markup/markup.xhtml |  1 -
 devtools/client/themes/markup.css             | 84 ++-----------------
 3 files changed, 8 insertions(+), 103 deletions(-)

diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js
index 19d32be70bcf..289c7c208f34 100644
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -2502,30 +2502,10 @@ MarkupContainer.prototype = {
    * viewed node.
    */
   update: function () {
-    this.elt.classList.remove("pseudoclass-hover");
-    this.elt.classList.remove("pseudoclass-active");
-    this.elt.classList.remove("pseudoclass-focus");
-    this.elt.removeAttribute("pseudoclass-count");
-
-    let {pseudoClassLocks} = this.node;
-
-    if (pseudoClassLocks.length) {
-      for (let state of pseudoClassLocks) {
-        switch (state) {
-          case ":hover":
-            this.elt.classList.add("pseudoclass-hover");
-            break;
-          case ":active":
-            this.elt.classList.add("pseudoclass-active");
-            break;
-          case ":focus":
-            this.elt.classList.add("pseudoclass-focus");
-            break;
-        }
-      }
-      this.elt.setAttribute("pseudoclass-count", pseudoClassLocks.length);
+    if (this.node.pseudoClassLocks.length) {
+      this.elt.classList.add("pseudoclass-locked");
     } else {
-      this.elt.removeAttribute("pseudoclass-count");
+      this.elt.classList.remove("pseudoclass-locked");
     }
 
     if (this.editor.update) {
diff --git a/devtools/client/inspector/markup/markup.xhtml b/devtools/client/inspector/markup/markup.xhtml
index cefed3928346..47943631f6a1 100644
--- a/devtools/client/inspector/markup/markup.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -25,7 +25,6 @@
 
     <ul class="children">
       <li id="template-elementcontainer" save="${elt}" class="child collapsed" role="presentation">
-        <div class="pseudoclass-locked-container"></div>
         <div save="${tagLine}" id="${id}" class="tag-line" role="treeitem" aria-level="${level}" aria-grabbed="${isDragging}"><!--
         --><span save="${tagState}" class="tag-state" role="presentation"></span><!--
         --><span save="${expander}" class="theme-twisty expander" role="presentation"></span><!--
diff --git a/devtools/client/themes/markup.css b/devtools/client/themes/markup.css
index b4b31e2cac46..c8a00ed73717 100644
--- a/devtools/client/themes/markup.css
+++ b/devtools/client/themes/markup.css
@@ -4,14 +4,8 @@
 
 :root {
   --markup-outline: var(--theme-splitter-color);
-
-  /* Pseudo-class lock indicators */
-  --hover-pseudo-background: var(--theme-highlight-green);
-  --active-pseudo-background: var(--theme-highlight-red);
-  --focus-pseudo-background: var(--theme-highlight-blue);
 }
 
-
 .theme-dark:root {
   --markup-outline: var(--theme-highlight-pink);
 }
@@ -261,88 +255,20 @@ ul.children + .tag-line::before {
   border: 1px solid #CCC;
 }
 
-/* Markup view elements with pseudo-class locks */
-
-.child:not([pseudoclass-count]) > .pseudoclass-locked-container {
-  display: none;
-}
-
 /* Draw a circle next to nodes that have a pseudo class lock.
    Center vertically with the 1.4em line height on .tag-line */
-.child[pseudoclass-count] > .pseudoclass-locked-container {
+.child.pseudoclass-locked::before {
+  content: "";
+  background: var(--theme-highlight-lightorange);
   border-radius: 50%;
   width: .8em;
   height: .8em;
-  margin-top: .2em;
-  left: 0;
-  overflow: hidden;
+  margin-top: .3em;
+  left: 1px;
   position: absolute;
   z-index: 1;
 }
 
-/* 1 pseudo-class lock */
-.child[pseudoclass-count="1"].pseudoclass-hover > .pseudoclass-locked-container {
-  background: var(--hover-pseudo-background);
-}
-
-.child[pseudoclass-count="1"].pseudoclass-active > .pseudoclass-locked-container {
-  background: var(--active-pseudo-background);
-}
-
-.child[pseudoclass-count="1"].pseudoclass-focus > .pseudoclass-locked-container {
-  background: var(--focus-pseudo-background);
-}
-
-/* 2 pseudo-class locks */
-.child[pseudoclass-count="2"] > .pseudoclass-locked-container::before,
-.child[pseudoclass-count="2"] > .pseudoclass-locked-container::after {
-  content: "";
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background: var(--active-pseudo-background);
-}
-
-.child[pseudoclass-count="2"] > .pseudoclass-locked-container::after {
-  transform: rotate(45deg) translate(50%);
-}
-
-/* Colors for active lock are already on before/after, now let hover/focus override appropriately */
-.child[pseudoclass-count="2"].pseudoclass-hover > .pseudoclass-locked-container::before {
-  background: var(--hover-pseudo-background);
-}
-
-.child[pseudoclass-count="2"].pseudoclass-focus > .pseudoclass-locked-container::after {
-  background: var(--focus-pseudo-background);
-}
-
-/* 3 pseudo-class locks */
-.child[pseudoclass-count="3"] > .pseudoclass-locked-container {
-  background: var(--hover-pseudo-background);
-}
-
-.child[pseudoclass-count="3"] > .pseudoclass-locked-container::before,
-.child[pseudoclass-count="3"] > .pseudoclass-locked-container::after {
-  content: "";
-  display: block;
-  width: 0.53333em;
-  height: 0.47059em;
-}
-
-.child[pseudoclass-count="3"] > .pseudoclass-locked-container::before {
-  transform: rotate(90deg) skew(30deg);
-  margin-left: -0.10429em;
-  margin-top: 0.05em;
-  background: var(--active-pseudo-background);
-}
-
-.child[pseudoclass-count="3"] > .pseudoclass-locked-container::after {
-  transform: rotate(30deg) skew(30deg);
-  margin-left: 0.35783em;
-  margin-top: -0.47em;
-  background: var(--focus-pseudo-background);
-}
-
 /* Firebug Theme */
 
 .theme-firebug .theme-fg-color3 {

From 071543fff5a2eb714a292ae173d168e417206e0d Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:48 -0700
Subject: [PATCH 31/57] Bug 1305788 - Part 1: Sync changed filter prefs back to
 system. r=bgrins

MozReview-Commit-ID: C9CMgjiXGSl
---
 devtools/client/preferences/devtools.js       | 18 +++--
 .../new-console-output/actions/filters.js     | 30 ++++++--
 .../new-console-output/actions/ui.js          | 14 +++-
 .../components/filter-bar.js                  |  6 +-
 .../components/filter-button.js               |  7 +-
 .../new-console-output/constants.js           | 19 ++++-
 .../new-console-output/reducers/filters.js    |  4 +-
 .../new-console-output/reducers/ui.js         |  9 ++-
 .../new-console-output/selectors/messages.js  |  2 +-
 .../webconsole/new-console-output/store.js    | 23 +++---
 .../test/mochitest/browser.ini                |  2 +
 .../mochitest/browser_webconsole_filters.js   | 72 +++++++++++++++++++
 .../new-console-output/test/mochitest/head.js | 20 +++++-
 .../test/mochitest/test-console-filters.html  | 17 +++++
 14 files changed, 205 insertions(+), 38 deletions(-)
 create mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
 create mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html

diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
index 1118bcbab348..8aab0124f944 100644
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -232,21 +232,24 @@ sticky_pref("devtools.theme", "dark");
 sticky_pref("devtools.theme", "light");
 #endif
 
-// Remember the Web Console filters
+// Web console filters
+pref("devtools.webconsole.filter.error", true);
+pref("devtools.webconsole.filter.warn", true);
+pref("devtools.webconsole.filter.info", true);
+pref("devtools.webconsole.filter.log", true);
+pref("devtools.webconsole.filter.debug", true);
+pref("devtools.webconsole.filter.net", false);
+pref("devtools.webconsole.filter.netxhr", false);
+// Deprecated - old console frontend
 pref("devtools.webconsole.filter.network", true);
 pref("devtools.webconsole.filter.networkinfo", false);
 pref("devtools.webconsole.filter.netwarn", true);
-pref("devtools.webconsole.filter.netxhr", false);
 pref("devtools.webconsole.filter.csserror", true);
 pref("devtools.webconsole.filter.cssparser", false);
 pref("devtools.webconsole.filter.csslog", false);
 pref("devtools.webconsole.filter.exception", true);
 pref("devtools.webconsole.filter.jswarn", true);
 pref("devtools.webconsole.filter.jslog", false);
-pref("devtools.webconsole.filter.error", true);
-pref("devtools.webconsole.filter.warn", true);
-pref("devtools.webconsole.filter.info", true);
-pref("devtools.webconsole.filter.log", true);
 pref("devtools.webconsole.filter.secerror", true);
 pref("devtools.webconsole.filter.secwarn", true);
 pref("devtools.webconsole.filter.serviceworkers", true);
@@ -282,6 +285,9 @@ pref("devtools.browserconsole.filter.serverwarn", false);
 pref("devtools.browserconsole.filter.serverinfo", false);
 pref("devtools.browserconsole.filter.serverlog", false);
 
+// Web console filter settings bar
+pref("devtools.webconsole.ui.filterbar", false);
+
 // Max number of inputs to store in web console history.
 pref("devtools.webconsole.inputHistoryCount", 50);
 
diff --git a/devtools/client/webconsole/new-console-output/actions/filters.js b/devtools/client/webconsole/new-console-output/actions/filters.js
index aa4bab2cd979..05d08021912d 100644
--- a/devtools/client/webconsole/new-console-output/actions/filters.js
+++ b/devtools/client/webconsole/new-console-output/actions/filters.js
@@ -6,11 +6,15 @@
 
 "use strict";
 
+const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const Services = require("Services");
+
 const {
   FILTER_TEXT_SET,
   FILTER_TOGGLE,
-  FILTERS_CLEAR
-} = require("../constants");
+  FILTERS_CLEAR,
+  PREFS,
+} = require("devtools/client/webconsole/new-console-output/constants");
 
 function filterTextSet(text) {
   return {
@@ -20,15 +24,27 @@ function filterTextSet(text) {
 }
 
 function filterToggle(filter) {
-  return {
-    type: FILTER_TOGGLE,
-    filter,
+  return (dispatch, getState) => {
+    dispatch({
+      type: FILTER_TOGGLE,
+      filter,
+    });
+    const filterState = getAllFilters(getState());
+    Services.prefs.setBoolPref(PREFS.FILTER[filter.toUpperCase()],
+      filterState.get(filter));
   };
 }
 
 function filtersClear() {
-  return {
-    type: FILTERS_CLEAR
+  return (dispatch, getState) => {
+    dispatch({
+      type: FILTERS_CLEAR,
+    });
+
+    const filterState = getAllFilters(getState());
+    for (let filter in filterState) {
+      Services.prefs.clearUserPref(PREFS.FILTER[filter.toUpperCase()]);
+    }
   };
 }
 
diff --git a/devtools/client/webconsole/new-console-output/actions/ui.js b/devtools/client/webconsole/new-console-output/actions/ui.js
index aa0ab54a5af2..cf9814d793d0 100644
--- a/devtools/client/webconsole/new-console-output/actions/ui.js
+++ b/devtools/client/webconsole/new-console-output/actions/ui.js
@@ -6,13 +6,21 @@
 
 "use strict";
 
+const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
+const Services = require("Services");
+
 const {
   FILTER_BAR_TOGGLE,
-} = require("../constants");
+  PREFS,
+} = require("devtools/client/webconsole/new-console-output/constants");
 
 function filterBarToggle(show) {
-  return {
-    type: FILTER_BAR_TOGGLE
+  return (dispatch, getState) => {
+    dispatch({
+      type: FILTER_BAR_TOGGLE
+    });
+    const uiState = getAllUi(getState());
+    Services.prefs.setBoolPref(PREFS.UI.FILTER_BAR, uiState.get("filterBarVisible"));
   };
 }
 
diff --git a/devtools/client/webconsole/new-console-output/components/filter-bar.js b/devtools/client/webconsole/new-console-output/components/filter-bar.js
index 2836ef0b16c5..75700cf71d06 100644
--- a/devtools/client/webconsole/new-console-output/components/filter-bar.js
+++ b/devtools/client/webconsole/new-console-output/components/filter-bar.js
@@ -73,7 +73,7 @@ const FilterBar = createClass({
 
     if (filterBarVisible) {
       children.push(
-        dom.div({className: "devtools-toolbar"},
+        dom.div({className: "devtools-toolbar webconsole-filterbar-secondary"},
           FilterButton({
             active: filter.error,
             label: "Errors",
@@ -114,9 +114,9 @@ const FilterBar = createClass({
             dispatch
           }),
           FilterButton({
-            active: filter.network,
+            active: filter.net,
             label: "Requests",
-            filterKey: "network",
+            filterKey: "net",
             dispatch
           })
         )
diff --git a/devtools/client/webconsole/new-console-output/components/filter-button.js b/devtools/client/webconsole/new-console-output/components/filter-button.js
index 0766126626eb..4c5c60cfeacf 100644
--- a/devtools/client/webconsole/new-console-output/components/filter-button.js
+++ b/devtools/client/webconsole/new-console-output/components/filter-button.js
@@ -26,9 +26,12 @@ const FilterButton = createClass({
   },
 
   render() {
-    const {label, active} = this.props;
+    const {active, label, filterKey} = this.props;
 
-    let classList = ["menu-filter-button"];
+    let classList = [
+      "menu-filter-button",
+      filterKey,
+    ];
     if (active) {
       classList.push("checked");
     }
diff --git a/devtools/client/webconsole/new-console-output/constants.js b/devtools/client/webconsole/new-console-output/constants.js
index 54121ecfc910..ef11d6eb8eb5 100644
--- a/devtools/client/webconsole/new-console-output/constants.js
+++ b/devtools/client/webconsole/new-console-output/constants.js
@@ -18,6 +18,23 @@ const actionTypes = {
   FILTER_BAR_TOGGLE: "FILTER_BAR_TOGGLE",
 };
 
+const prefs = {
+  PREFS: {
+    FILTER: {
+      ERROR: "devtools.webconsole.filter.error",
+      WARN: "devtools.webconsole.filter.warn",
+      INFO: "devtools.webconsole.filter.info",
+      LOG: "devtools.webconsole.filter.log",
+      DEBUG: "devtools.webconsole.filter.debug",
+      NET: "devtools.webconsole.filter.net",
+      NETXHR: "devtools.webconsole.filter.netxhr",
+    },
+    UI: {
+      FILTER_BAR: "devtools.webconsole.ui.filterbar"
+    }
+  }
+};
+
 const chromeRDPEnums = {
   MESSAGE_SOURCE: {
     XML: "xml",
@@ -61,4 +78,4 @@ const chromeRDPEnums = {
 };
 
 // Combine into a single constants object
-module.exports = Object.assign({}, actionTypes, chromeRDPEnums);
+module.exports = Object.assign({}, actionTypes, prefs, chromeRDPEnums);
diff --git a/devtools/client/webconsole/new-console-output/reducers/filters.js b/devtools/client/webconsole/new-console-output/reducers/filters.js
index f66ce525eeaf..cd5f4bf7c46e 100644
--- a/devtools/client/webconsole/new-console-output/reducers/filters.js
+++ b/devtools/client/webconsole/new-console-output/reducers/filters.js
@@ -13,8 +13,8 @@ const FilterState = Immutable.Record({
   error: true,
   info: true,
   log: true,
-  network: true,
-  netxhr: true,
+  net: false,
+  netxhr: false,
   text: "",
   warn: true,
 });
diff --git a/devtools/client/webconsole/new-console-output/reducers/ui.js b/devtools/client/webconsole/new-console-output/reducers/ui.js
index 9431b669e816..bcc1bf725b52 100644
--- a/devtools/client/webconsole/new-console-output/reducers/ui.js
+++ b/devtools/client/webconsole/new-console-output/reducers/ui.js
@@ -8,12 +8,12 @@
 const constants = require("devtools/client/webconsole/new-console-output/constants");
 const Immutable = require("devtools/client/shared/vendor/immutable");
 
-const Ui = Immutable.Record({
+const UiState = Immutable.Record({
   filterBarVisible: false,
   filteredMessageVisible: false,
 });
 
-function ui(state = new Ui(), action) {
+function ui(state = new UiState(), action) {
   switch (action.type) {
     case constants.FILTER_BAR_TOGGLE:
       return state.set("filterBarVisible", !state.filterBarVisible);
@@ -22,4 +22,7 @@ function ui(state = new Ui(), action) {
   return state;
 }
 
-exports.ui = ui;
+module.exports = {
+  UiState,
+  ui,
+};
diff --git a/devtools/client/webconsole/new-console-output/selectors/messages.js b/devtools/client/webconsole/new-console-output/selectors/messages.js
index 662491bb8052..948d4aff4c48 100644
--- a/devtools/client/webconsole/new-console-output/selectors/messages.js
+++ b/devtools/client/webconsole/new-console-output/selectors/messages.js
@@ -49,7 +49,7 @@ function filterNetwork(messages, filters) {
   return messages.filter((message) => {
     return (
       message.source !== MESSAGE_SOURCE.NETWORK
-      || (filters.get("network") === true && message.isXHR === false)
+      || (filters.get("net") === true && message.isXHR === false)
       || (filters.get("netxhr") === true && message.isXHR === true)
       || [MESSAGE_TYPE.COMMAND, MESSAGE_TYPE.RESULT].includes(message.type)
     );
diff --git a/devtools/client/webconsole/new-console-output/store.js b/devtools/client/webconsole/new-console-output/store.js
index 8bc34aa303be..8ad7947e9ba9 100644
--- a/devtools/client/webconsole/new-console-output/store.js
+++ b/devtools/client/webconsole/new-console-output/store.js
@@ -5,6 +5,7 @@
 
 const {FilterState} = require("devtools/client/webconsole/new-console-output/reducers/filters");
 const {PrefState} = require("devtools/client/webconsole/new-console-output/reducers/prefs");
+const {UiState} = require("devtools/client/webconsole/new-console-output/reducers/ui");
 const {
   applyMiddleware,
   combineReducers,
@@ -12,7 +13,10 @@ const {
   createStore
 } = require("devtools/client/shared/vendor/redux");
 const { thunk } = require("devtools/client/shared/redux/middleware/thunk");
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const {
+  BATCH_ACTIONS,
+  PREFS,
+} = require("devtools/client/webconsole/new-console-output/constants");
 const { reducers } = require("./reducers/index");
 const Services = require("Services");
 
@@ -22,12 +26,15 @@ function configureStore() {
       logLimit: Math.max(Services.prefs.getIntPref("devtools.hud.loglimit"), 1),
     }),
     filters: new FilterState({
-      error: Services.prefs.getBoolPref("devtools.webconsole.filter.error"),
-      warn: Services.prefs.getBoolPref("devtools.webconsole.filter.warn"),
-      info: Services.prefs.getBoolPref("devtools.webconsole.filter.info"),
-      log: Services.prefs.getBoolPref("devtools.webconsole.filter.log"),
-      network: Services.prefs.getBoolPref("devtools.webconsole.filter.network"),
-      netxhr: Services.prefs.getBoolPref("devtools.webconsole.filter.netxhr"),
+      error: Services.prefs.getBoolPref(PREFS.FILTER.ERROR),
+      warn: Services.prefs.getBoolPref(PREFS.FILTER.WARN),
+      info: Services.prefs.getBoolPref(PREFS.FILTER.INFO),
+      log: Services.prefs.getBoolPref(PREFS.FILTER.LOG),
+      net: Services.prefs.getBoolPref(PREFS.FILTER.NET),
+      netxhr: Services.prefs.getBoolPref(PREFS.FILTER.NETXHR),
+    }),
+    ui: new UiState({
+      filterBarVisible: Services.prefs.getBoolPref(PREFS.UI.FILTER_BAR),
     })
   };
 
@@ -45,7 +52,7 @@ function enableBatching() {
   return next => (reducer, initialState, enhancer) => {
     function batchingReducer(state, action) {
       switch (action.type) {
-        case constants.BATCH_ACTIONS:
+        case BATCH_ACTIONS:
           return action.actions.reduce(batchingReducer, state);
         default:
           return reducer(state, action);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 2bc22726eb7d..bd4d30e9f52c 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -6,8 +6,10 @@ support-files =
   !/devtools/client/framework/test/shared-head.js
   test-console-table.html
   test-console.html
+  test-console-filters.html
 
 [browser_webconsole_console_table.js]
+[browser_webconsole_filters.js]
 [browser_webconsole_init.js]
 [browser_webconsole_input_focus.js]
 [browser_webconsole_observer_notifications.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
new file mode 100644
index 000000000000..8eb5369261ed
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
@@ -0,0 +1,72 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests filters.
+
+"use strict";
+
+const { MESSAGE_LEVEL } = require("devtools/client/webconsole/new-console-output/constants");
+
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html";
+
+add_task(function* () {
+  let hud = yield openNewTabAndConsole(TEST_URI);
+  const outputNode = hud.ui.experimentalOutputNode;
+
+  const toolbar = yield waitFor(() => {
+    return outputNode.querySelector(".webconsole-filterbar-primary");
+  });
+  ok(toolbar, "Toolbar found");
+
+  // Show the filter bar
+  toolbar.querySelector(".devtools-filter-icon").click();
+  const filterBar = yield waitFor(() => {
+    return outputNode.querySelector(".webconsole-filterbar-secondary");
+  });
+  ok(filterBar, "Filter bar is shown when filter icon is clicked.");
+
+  // Check defaults.
+  Object.values(MESSAGE_LEVEL).forEach(level => {
+    ok(filterIsEnabled(filterBar.querySelector(`.${level}`)),
+      `Filter button for ${level} is on by default`);
+  });
+  ["net", "netxhr"].forEach(category => {
+    ok(!filterIsEnabled(filterBar.querySelector(`.${category}`)),
+      `Filter button for ${category} is off by default`);
+  });
+
+  // Check that messages are shown as expected. This depends on cached messages being
+  // shown.
+  ok(findMessages(hud, "").length == 5,
+    "Messages of all levels shown when filters are on.");
+
+  // Check that messages are not shown when their filter is turned off.
+  filterBar.querySelector(".error").click();
+  yield waitFor(() => findMessages(hud, "").length == 4);
+  ok(true, "When a filter is turned off, its messages are not shown.");
+
+  // Check that the ui settings were persisted.
+  yield closeTabAndToolbox();
+  yield testFilterPersistence();
+});
+
+function filterIsEnabled(button) {
+  return button.classList.contains("checked");
+}
+
+function* testFilterPersistence() {
+  let hud = yield openNewTabAndConsole(TEST_URI);
+  const outputNode = hud.ui.experimentalOutputNode;
+  const filterBar = yield waitFor(() => {
+    return outputNode.querySelector(".webconsole-filterbar-secondary");
+  });
+  ok(filterBar, "Filter bar ui setting is persisted.");
+
+  // Check that the filter settings were persisted.
+  ok(!filterIsEnabled(filterBar.querySelector(".error")),
+    "Filter button setting is persisted");
+  ok(findMessages(hud, "").length == 4,
+    "Messages of all levels shown when filters are on.");
+}
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
index 97170b3adb3a..d379e9b18851 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -109,9 +109,25 @@ function* waitFor(condition, message = "waitFor", interval = 100, maxTries = 50)
  *        The selector to use in finding the message.
  */
 function findMessage(hud, text, selector = ".message") {
+  const elements = findMessages(hud, text, selector);
+  return elements.pop();
+}
+
+/**
+ * Find multiple messages in the output.
+ *
+ * @param object hud
+ *        The web console.
+ * @param string text
+ *        A substring that can be found in the message.
+ * @param selector [optional]
+ *        The selector to use in finding the message.
+ */
+function findMessages(hud, text, selector = ".message") {
+  const messages = hud.ui.experimentalOutputNode.querySelectorAll(selector);
   const elements = Array.prototype.filter.call(
-    hud.ui.experimentalOutputNode.querySelectorAll(selector),
+    messages,
     (el) => el.textContent.includes(text)
   );
-  return elements.length > 0 ? elements.pop() : false;
+  return elements;
 }
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
new file mode 100644
index 000000000000..293421549505
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Webconsole filters test page</title>
+  </head>
+  <body>
+    <p>Webconsole filters test page</p>
+    <script>
+      console.log("console log");
+      console.warn("console warn");
+      console.error("console error");
+      console.info("console info");
+      console.count("console debug");
+    </script>
+  </body>
+</html>

From 92c289047a5d1782c49b580c580ec3f32eb78c75 Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:48 -0700
Subject: [PATCH 32/57] Bug 1305788 - Part 2: Remove mocha unit testing of
 actions. r=me

MozReview-Commit-ID: AGCvvLdztDc
---
 .../test/actions/filters.test.js              | 54 ------------
 .../test/actions/messages.test.js             | 88 -------------------
 .../test/actions/ui.test.js                   | 23 -----
 .../test/components/filter-button.test.js     | 19 +---
 devtools/client/webconsole/package.json       |  1 -
 5 files changed, 2 insertions(+), 183 deletions(-)
 delete mode 100644 devtools/client/webconsole/new-console-output/test/actions/filters.test.js
 delete mode 100644 devtools/client/webconsole/new-console-output/test/actions/messages.test.js
 delete mode 100644 devtools/client/webconsole/new-console-output/test/actions/ui.test.js

diff --git a/devtools/client/webconsole/new-console-output/test/actions/filters.test.js b/devtools/client/webconsole/new-console-output/test/actions/filters.test.js
deleted file mode 100644
index 7ab46770011b..000000000000
--- a/devtools/client/webconsole/new-console-output/test/actions/filters.test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const {
-  FILTER_TEXT_SET,
-  FILTER_TOGGLE,
-  FILTERS_CLEAR,
-  MESSAGE_LEVEL
-} = require("devtools/client/webconsole/new-console-output/constants");
-
-const expect = require("expect");
-
-describe("Filter actions:", () => {
-  describe("filterTextSet", () => {
-    it("creates expected action", () => {
-      const action = actions.filterTextSet("test");
-      const expected = {
-        type: FILTER_TEXT_SET,
-        text: "test"
-      };
-
-      expect(action).toEqual(expected);
-    });
-  });
-
-  describe("filterToggle", () => {
-    it("creates expected action", () => {
-      const action = actions.filterToggle(MESSAGE_LEVEL.ERROR);
-      const expected = {
-        type: FILTER_TOGGLE,
-        filter: "error"
-      };
-
-      expect(action).toEqual(expected);
-    });
-  });
-
-  describe("filterTextApply", () => {
-
-  });
-
-  describe("filtersClear", () => {
-    it("creates expected action", () => {
-      const action = actions.filtersClear();
-      const expected = {
-        type: FILTERS_CLEAR
-      };
-
-      expect(action).toEqual(expected);
-    });
-  });
-});
diff --git a/devtools/client/webconsole/new-console-output/test/actions/messages.test.js b/devtools/client/webconsole/new-console-output/test/actions/messages.test.js
deleted file mode 100644
index 5bdf2e2400ed..000000000000
--- a/devtools/client/webconsole/new-console-output/test/actions/messages.test.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { thunk } = require("devtools/client/shared/redux/middleware/thunk");
-const configureStore = require("redux-mock-store").default;
-const { getRepeatId } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const { setupActions } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const constants = require("devtools/client/webconsole/new-console-output/constants");
-
-const mockStore = configureStore([ thunk ]);
-
-const expect = require("expect");
-
-let actions;
-
-describe("Message actions:", () => {
-  beforeEach(()=>{
-    actions = setupActions();
-  });
-
-  describe("messageAdd", () => {
-    it("dispatches expected action given a packet", () => {
-      const packet = stubPackets.get("console.log('foobar', 'test')");
-      const store = mockStore({});
-      store.dispatch(actions.messageAdd(packet));
-
-      const actualActions = store.getActions();
-      expect(actualActions.length).toEqual(1);
-
-      const addAction = actualActions[0];
-      const {message} = addAction;
-      const expectedAction = {
-        type: constants.MESSAGE_ADD,
-        message: stubPreparedMessages.get("console.log('foobar', 'test')")
-      };
-      expect(message.toJS()).toEqual(expectedAction.message.toJS());
-    });
-
-    it("dispatches expected actions given a console.clear packet", () => {
-      const packet = stubPackets.get("console.clear()");
-      const store = mockStore({});
-      store.dispatch(actions.messageAdd(packet));
-
-      const actualActions = store.getActions();
-      expect(actualActions.length).toEqual(1);
-
-      const [clearAction, addAction] = actualActions[0].actions;
-      expect(clearAction.type).toEqual(constants.MESSAGES_CLEAR);
-
-      const {message} = addAction;
-      const expectedAction = {
-        type: constants.MESSAGE_ADD,
-        message: stubPreparedMessages.get("console.clear()")
-      };
-      expect(addAction.type).toEqual(constants.MESSAGE_ADD);
-      expect(message.toJS()).toEqual(expectedAction.message.toJS());
-    });
-
-    it("dispatches expected action given a console.table packet", () => {
-      const packet = stubPackets.get("console.table(['a', 'b', 'c'])");
-      const store = mockStore({});
-      store.dispatch(actions.messageAdd(packet));
-
-      const expectedActions = store.getActions();
-      expect(expectedActions.length).toEqual(1);
-
-      const addAction = expectedActions[0];
-      const {message} = addAction;
-      const expected = {
-        type: constants.MESSAGE_ADD,
-        message: stubPreparedMessages.get("console.table(['a', 'b', 'c'])")
-      };
-      expect(message.toJS()).toEqual(expected.message.toJS());
-    });
-  });
-
-  describe("messagesClear", () => {
-    it("creates expected action", () => {
-      const action = actions.messagesClear();
-      const expected = {
-        type: constants.MESSAGES_CLEAR,
-      };
-      expect(action).toEqual(expected);
-    });
-  });
-});
diff --git a/devtools/client/webconsole/new-console-output/test/actions/ui.test.js b/devtools/client/webconsole/new-console-output/test/actions/ui.test.js
deleted file mode 100644
index 0bb43ae55094..000000000000
--- a/devtools/client/webconsole/new-console-output/test/actions/ui.test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const {
-  FILTER_BAR_TOGGLE
-} = require("devtools/client/webconsole/new-console-output/constants");
-
-const expect = require("expect");
-
-describe("UI actions:", () => {
-  describe("filterBarToggle", () => {
-    it("creates expected action", () => {
-      const action = actions.filterBarToggle();
-      const expected = {
-        type: FILTER_BAR_TOGGLE
-      };
-
-      expect(action).toEqual(expected);
-    });
-  });
-});
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
index 609825a91efd..f8ab7edca6d4 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
@@ -3,23 +3,18 @@
 "use strict";
 
 const expect = require("expect");
-const sinon = require("sinon");
-const { render, shallow } = require("enzyme");
+const { render } = require("enzyme");
 
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button").FilterButton);
-const {
-  FILTER_TOGGLE,
-  MESSAGE_LEVEL
-} = require("devtools/client/webconsole/new-console-output/constants");
+const { MESSAGE_LEVEL } = require("devtools/client/webconsole/new-console-output/constants");
 
 describe("FilterButton component:", () => {
   const props = {
     active: true,
     label: "Error",
     filterKey: MESSAGE_LEVEL.ERROR,
-    dispatch: sinon.spy()
   };
 
   it("displays as active when turned on", () => {
@@ -36,14 +31,4 @@ describe("FilterButton component:", () => {
       "<button class=\"menu-filter-button\">Error</button>"
     );
   });
-
-  it("fires FILTER_TOGGLE action when clicked", () => {
-    const wrapper = shallow(FilterButton(props));
-    wrapper.find("button").simulate("click");
-    const call = props.dispatch.getCall(0);
-    expect(call.args[0]).toEqual({
-      type: FILTER_TOGGLE,
-      filter: MESSAGE_LEVEL.ERROR
-    });
-  });
 });
diff --git a/devtools/client/webconsole/package.json b/devtools/client/webconsole/package.json
index ccc936237190..6349f2057c01 100644
--- a/devtools/client/webconsole/package.json
+++ b/devtools/client/webconsole/package.json
@@ -10,7 +10,6 @@
     "jsdom": "^9.4.1",
     "jsdom-global": "^2.0.0",
     "mocha": "^2.5.3",
-    "redux-mock-store": "^1.1.4",
     "require-hacker": "^2.1.4",
     "sinon": "^1.17.5"
   },

From a987b44a803314e738cf8a2c45b8826145e046db Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:48 -0700
Subject: [PATCH 33/57] Bug 1305788 - Part 3: Update mocha tests. r=me

MozReview-Commit-ID: 5DvUWErni0O
---
 .../test/components/filter-button.test.js     |  4 ++--
 .../test/fixtures/Services.js                 | 16 ++++++++++-----
 .../test/store/filters.test.js                | 20 +++++++++----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
index f8ab7edca6d4..3eb0cdc7e497 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
@@ -20,7 +20,7 @@ describe("FilterButton component:", () => {
   it("displays as active when turned on", () => {
     const wrapper = render(FilterButton(props));
     expect(wrapper.html()).toBe(
-      "<button class=\"menu-filter-button checked\">Error</button>"
+      "<button class=\"menu-filter-button error checked\">Error</button>"
     );
   });
 
@@ -28,7 +28,7 @@ describe("FilterButton component:", () => {
     const inactiveProps = Object.assign({}, props, { active: false });
     const wrapper = render(FilterButton(inactiveProps));
     expect(wrapper.html()).toBe(
-      "<button class=\"menu-filter-button\">Error</button>"
+      "<button class=\"menu-filter-button error\">Error</button>"
     );
   });
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/Services.js b/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
index e91d66b1e8e9..61b3d5e13845 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
@@ -3,6 +3,8 @@
 
 "use strict";
 
+const { PREFS } = require("devtools/client/webconsole/new-console-output/constants");
+
 module.exports = {
   prefs: {
     getIntPref: pref => {
@@ -12,10 +14,14 @@ module.exports = {
       }
     },
     getBoolPref: pref => {
-      switch (pref) {
-        default:
-          return true;
-      }
-    }
+      const falsey = [
+        PREFS.FILTER.NET,
+        PREFS.FILTER.NETXHR,
+        PREFS.UI.FILTER_BAR,
+      ];
+      return !falsey.includes(pref);
+    },
+    setBoolPref: () => {},
+    clearUserPref: () => {},
   }
 };
diff --git a/devtools/client/webconsole/new-console-output/test/store/filters.test.js b/devtools/client/webconsole/new-console-output/test/store/filters.test.js
index 04fa55ad3d27..d2ce21e22e7b 100644
--- a/devtools/client/webconsole/new-console-output/test/store/filters.test.js
+++ b/devtools/client/webconsole/new-console-output/test/store/filters.test.js
@@ -65,11 +65,11 @@ describe("Filtering", () => {
       store.dispatch(messageAdd(message));
 
       let messages = getAllMessages(store.getState());
-      expect(messages.size).toEqual(numMessages + 1);
+      expect(messages.size).toEqual(numMessages);
 
       store.dispatch(actions.filterToggle("netxhr"));
       messages = getAllMessages(store.getState());
-      expect(messages.size).toEqual(numMessages);
+      expect(messages.size).toEqual(numMessages + 1);
     });
 
     it("filters network messages", () => {
@@ -77,11 +77,11 @@ describe("Filtering", () => {
       store.dispatch(messageAdd(message));
 
       let messages = getAllMessages(store.getState());
-      expect(messages.size).toEqual(numMessages + 1);
-
-      store.dispatch(actions.filterToggle("network"));
-      messages = getAllMessages(store.getState());
       expect(messages.size).toEqual(numMessages);
+
+      store.dispatch(actions.filterToggle("net"));
+      messages = getAllMessages(store.getState());
+      expect(messages.size).toEqual(numMessages + 1);
     });
   });
 
@@ -171,8 +171,8 @@ describe("Clear filters", () => {
       "error": false,
       "info": true,
       "log": true,
-      "network": true,
-      "netxhr": false,
+      "net": false,
+      "netxhr": true,
       "warn": true,
       "text": "foobar"
     });
@@ -185,8 +185,8 @@ describe("Clear filters", () => {
       "error": true,
       "info": true,
       "log": true,
-      "network": true,
-      "netxhr": true,
+      "net": false,
+      "netxhr": false,
       "warn": true,
       "text": ""
     });

From fe85dc90306596d838730b0276f06b6e36a1912c Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 34/57] Bug 1306460 - New console frontend: Fix text filtering.
 r=bgrins,r=nchevobbe

MozReview-Commit-ID: A0sEoQ2bzdo
---
 .../client/webconsole/new-console-output/selectors/messages.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devtools/client/webconsole/new-console-output/selectors/messages.js b/devtools/client/webconsole/new-console-output/selectors/messages.js
index 948d4aff4c48..3b559c91f440 100644
--- a/devtools/client/webconsole/new-console-output/selectors/messages.js
+++ b/devtools/client/webconsole/new-console-output/selectors/messages.js
@@ -99,6 +99,9 @@ function search(messages, text = "") {
 }
 
 function isTextInFrame(text, frame) {
+  if (!frame) {
+    return false;
+  }
   // @TODO Change this to Object.values once it's supported in Node's version of V8
   return Object.keys(frame)
     .map(key => frame[key])

From f3a08a3d225fc4bd49f25adeb25b045f0bab0c9c Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 35/57] Bug 1306622 - New console frontend: Factor out common
 HTML structures from message types. r=bgrins

MozReview-Commit-ID: 3JjyRuJyFAP

--HG--
rename : devtools/client/webconsole/new-console-output/test/components/repeat.test.js => devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
---
 .../components/collapse-button.js             |   2 +-
 .../components/console-output.js              |   4 +-
 .../components/console-table.js               |   4 +-
 .../components/filter-bar.js                  |   2 +-
 .../components/filter-button.js               |   2 +-
 .../components/grip-message-body.js           |   4 +-
 .../components/message-container.js           |  12 +-
 .../components/message-icon.js                |   2 +-
 .../components/message-repeat.js              |   2 +-
 .../message-types/console-api-call.js         | 103 +++++---------
 .../message-types/console-command.js          |  43 ++----
 .../message-types/default-renderer.js         |   2 +-
 .../message-types/evaluation-result.js        |  43 +++---
 .../message-types/network-event-message.js    |  65 +++------
 .../components/message-types/page-error.js    | 102 +++++---------
 .../new-console-output/components/message.js  | 128 ++++++++++++++++++
 .../new-console-output/components/moz.build   |   1 +
 .../components/variables-view-link.js         |   2 +-
 .../test/components/console-api-call.test.js  |   2 +-
 .../test/components/evaluation-result.test.js |   2 +-
 .../test/components/filter-bar.test.js        |   2 +-
 .../test/components/filter-button.test.js     |   2 +-
 .../test/components/message-container.test.js |   6 +-
 .../test/components/message-icon.test.js      |   2 +-
 ...{repeat.test.js => message-repeat.test.js} |   2 +-
 .../components/network-event-message.test.js  |   2 +-
 .../test/components/page-error.test.js        |   2 +-
 27 files changed, 277 insertions(+), 268 deletions(-)
 create mode 100644 devtools/client/webconsole/new-console-output/components/message.js
 rename devtools/client/webconsole/new-console-output/test/components/{repeat.test.js => message-repeat.test.js} (87%)

diff --git a/devtools/client/webconsole/new-console-output/components/collapse-button.js b/devtools/client/webconsole/new-console-output/components/collapse-button.js
index 8859d2bfec22..eba093b1dcfd 100644
--- a/devtools/client/webconsole/new-console-output/components/collapse-button.js
+++ b/devtools/client/webconsole/new-console-output/components/collapse-button.js
@@ -40,4 +40,4 @@ const CollapseButton = createClass({
   }
 });
 
-module.exports.CollapseButton = CollapseButton;
+module.exports = CollapseButton;
diff --git a/devtools/client/webconsole/new-console-output/components/console-output.js b/devtools/client/webconsole/new-console-output/components/console-output.js
index 897ae5101fde..f0c038ec8d57 100644
--- a/devtools/client/webconsole/new-console-output/components/console-output.js
+++ b/devtools/client/webconsole/new-console-output/components/console-output.js
@@ -17,6 +17,8 @@ const MessageContainer = createFactory(require("devtools/client/webconsole/new-c
 
 const ConsoleOutput = createClass({
 
+  displayName: "ConsoleOutput",
+
   propTypes: {
     hudProxyClient: PropTypes.object.isRequired,
     messages: PropTypes.object.isRequired,
@@ -27,8 +29,6 @@ const ConsoleOutput = createClass({
     openLink: PropTypes.func.isRequired,
   },
 
-  displayName: "ConsoleOutput",
-
   componentWillUpdate() {
     let node = ReactDOM.findDOMNode(this);
     if (node.lastChild) {
diff --git a/devtools/client/webconsole/new-console-output/components/console-table.js b/devtools/client/webconsole/new-console-output/components/console-table.js
index bf8183fe6b0e..65369f31f2e3 100644
--- a/devtools/client/webconsole/new-console-output/components/console-table.js
+++ b/devtools/client/webconsole/new-console-output/components/console-table.js
@@ -12,7 +12,7 @@ const {
 const { ObjectClient } = require("devtools/shared/client/main");
 const actions = require("devtools/client/webconsole/new-console-output/actions/messages");
 const {l10n} = require("devtools/client/webconsole/new-console-output/utils/messages");
-const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body").GripMessageBody);
+const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body"));
 
 const TABLE_ROW_MAX_ITEMS = 1000;
 const TABLE_COLUMN_MAX_ITEMS = 10;
@@ -197,4 +197,4 @@ function getTableItems(data = {}, type, headers = null) {
   };
 }
 
-exports.ConsoleTable = ConsoleTable;
+module.exports = ConsoleTable;
diff --git a/devtools/client/webconsole/new-console-output/components/filter-bar.js b/devtools/client/webconsole/new-console-output/components/filter-bar.js
index 75700cf71d06..2dd7c22266d2 100644
--- a/devtools/client/webconsole/new-console-output/components/filter-bar.js
+++ b/devtools/client/webconsole/new-console-output/components/filter-bar.js
@@ -18,7 +18,7 @@ const uiActions = require("devtools/client/webconsole/new-console-output/actions
 const {
   MESSAGE_LEVEL
 } = require("../constants");
-const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button").FilterButton);
+const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button"));
 
 const FilterBar = createClass({
 
diff --git a/devtools/client/webconsole/new-console-output/components/filter-button.js b/devtools/client/webconsole/new-console-output/components/filter-button.js
index 4c5c60cfeacf..4116bb5248d1 100644
--- a/devtools/client/webconsole/new-console-output/components/filter-button.js
+++ b/devtools/client/webconsole/new-console-output/components/filter-button.js
@@ -43,4 +43,4 @@ const FilterButton = createClass({
   }
 });
 
-exports.FilterButton = FilterButton;
+module.exports = FilterButton;
diff --git a/devtools/client/webconsole/new-console-output/components/grip-message-body.js b/devtools/client/webconsole/new-console-output/components/grip-message-body.js
index 39e4a9864e83..5f38bd3d0a9b 100644
--- a/devtools/client/webconsole/new-console-output/components/grip-message-body.js
+++ b/devtools/client/webconsole/new-console-output/components/grip-message-body.js
@@ -20,7 +20,7 @@ const {
 const { createFactories } = require("devtools/client/shared/components/reps/rep-utils");
 const { Rep } = createFactories(require("devtools/client/shared/components/reps/rep"));
 const StringRep = createFactories(require("devtools/client/shared/components/reps/string").StringRep).rep;
-const VariablesViewLink = createFactory(require("devtools/client/webconsole/new-console-output/components/variables-view-link").VariablesViewLink);
+const VariablesViewLink = createFactory(require("devtools/client/webconsole/new-console-output/components/variables-view-link"));
 const { Grip } = require("devtools/client/shared/components/reps/grip");
 
 GripMessageBody.displayName = "GripMessageBody";
@@ -53,4 +53,4 @@ function GripMessageBody(props) {
   );
 }
 
-module.exports.GripMessageBody = GripMessageBody;
+module.exports = GripMessageBody;
diff --git a/devtools/client/webconsole/new-console-output/components/message-container.js b/devtools/client/webconsole/new-console-output/components/message-container.js
index 8a5d1aa89a4f..f5c0c7a5909f 100644
--- a/devtools/client/webconsole/new-console-output/components/message-container.js
+++ b/devtools/client/webconsole/new-console-output/components/message-container.js
@@ -19,12 +19,12 @@ const {
 } = require("devtools/client/webconsole/new-console-output/constants");
 
 const componentMap = new Map([
-  ["ConsoleApiCall", require("./message-types/console-api-call").ConsoleApiCall],
-  ["ConsoleCommand", require("./message-types/console-command").ConsoleCommand],
-  ["DefaultRenderer", require("./message-types/default-renderer").DefaultRenderer],
-  ["EvaluationResult", require("./message-types/evaluation-result").EvaluationResult],
-  ["NetworkEventMessage", require("./message-types/network-event-message").NetworkEventMessage],
-  ["PageError", require("./message-types/page-error").PageError]
+  ["ConsoleApiCall", require("./message-types/console-api-call")],
+  ["ConsoleCommand", require("./message-types/console-command")],
+  ["DefaultRenderer", require("./message-types/default-renderer")],
+  ["EvaluationResult", require("./message-types/evaluation-result")],
+  ["NetworkEventMessage", require("./message-types/network-event-message")],
+  ["PageError", require("./message-types/page-error")]
 ]);
 
 const MessageContainer = createClass({
diff --git a/devtools/client/webconsole/new-console-output/components/message-icon.js b/devtools/client/webconsole/new-console-output/components/message-icon.js
index 045a033fe5c4..b4c32fda0a51 100644
--- a/devtools/client/webconsole/new-console-output/components/message-icon.js
+++ b/devtools/client/webconsole/new-console-output/components/message-icon.js
@@ -29,4 +29,4 @@ function MessageIcon(props) {
   });
 }
 
-module.exports.MessageIcon = MessageIcon;
+module.exports = MessageIcon;
diff --git a/devtools/client/webconsole/new-console-output/components/message-repeat.js b/devtools/client/webconsole/new-console-output/components/message-repeat.js
index 2b3db96ad315..4f1236e93ab6 100644
--- a/devtools/client/webconsole/new-console-output/components/message-repeat.js
+++ b/devtools/client/webconsole/new-console-output/components/message-repeat.js
@@ -25,4 +25,4 @@ function MessageRepeat(props) {
   return dom.span({className: "message-repeats", style: {visibility}}, repeat);
 }
 
-exports.MessageRepeat = MessageRepeat;
+module.exports = MessageRepeat;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js b/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
index 56e42bd6a2e9..cb175fc14119 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
@@ -12,14 +12,10 @@ const {
   DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const FrameView = createFactory(require("devtools/client/shared/components/frame"));
-const StackTrace = createFactory(require("devtools/client/shared/components/stack-trace"));
-const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body").GripMessageBody);
-const MessageRepeat = createFactory(require("devtools/client/webconsole/new-console-output/components/message-repeat").MessageRepeat);
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon").MessageIcon);
-const CollapseButton = createFactory(require("devtools/client/webconsole/new-console-output/components/collapse-button").CollapseButton);
-const ConsoleTable = createFactory(require("devtools/client/webconsole/new-console-output/components/console-table").ConsoleTable);
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body"));
+const ConsoleTable = createFactory(require("devtools/client/webconsole/new-console-output/components/console-table"));
+
+const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/message"));
 
 ConsoleApiCall.displayName = "ConsoleApiCall";
 
@@ -45,7 +41,15 @@ function ConsoleApiCall(props) {
     hudProxyClient,
     tableData
   } = props;
-  const {source, level, stacktrace, type, frame, parameters } = message;
+  const {
+    id: messageId,
+    source, type,
+    level,
+    repeat,
+    stacktrace,
+    frame,
+    parameters
+  } = message;
 
   let messageBody;
   if (type === "trace") {
@@ -62,41 +66,8 @@ function ConsoleApiCall(props) {
     messageBody = message.messageText;
   }
 
-  const icon = MessageIcon({ level });
-  const repeat = MessageRepeat({ repeat: message.repeat });
-  const shouldRenderFrame = frame && frame.source !== "debugger eval code";
-  const location = dom.span({ className: "message-location devtools-monospace" },
-    shouldRenderFrame ? FrameView({
-      frame,
-      onClick: onViewSourceInDebugger,
-      showEmptyPathAsHost: true,
-      sourceMapService
-    }) : null
-  );
-
-  let collapse = "";
-  let attachment = "";
-  if (stacktrace) {
-    if (open) {
-      attachment = dom.div({ className: "stacktrace devtools-monospace" },
-        StackTrace({
-          stacktrace: stacktrace,
-          onViewSourceInDebugger: onViewSourceInDebugger
-        })
-      );
-    }
-
-    collapse = CollapseButton({
-      open,
-      onClick: function () {
-        if (open) {
-          dispatch(actions.messageClose(message.id));
-        } else {
-          dispatch(actions.messageOpen(message.id));
-        }
-      },
-    });
-  } else if (type === "table") {
+  let attachment = null;
+  if (type === "table") {
     attachment = ConsoleTable({
       dispatch,
       id: message.id,
@@ -106,32 +77,24 @@ function ConsoleApiCall(props) {
     });
   }
 
-  const classes = ["message", "cm-s-mozilla"];
+  const topLevelClasses = ["cm-s-mozilla"];
 
-  classes.push(source);
-  classes.push(type);
-  classes.push(level);
-
-  if (open === true) {
-    classes.push("open");
-  }
-
-  return dom.div({ className: classes.join(" ") },
-    // @TODO add timestamp
-    // @TODO add indent if necessary
-    icon,
-    collapse,
-    dom.span({ className: "message-body-wrapper" },
-      dom.span({ className: "message-flex-body" },
-        dom.span({ className: "message-body devtools-monospace" },
-          messageBody
-        ),
-        repeat,
-        location
-      ),
-      attachment
-    )
-  );
+  return Message({
+    messageId,
+    open,
+    source,
+    type,
+    level,
+    topLevelClasses,
+    messageBody,
+    repeat,
+    frame,
+    stacktrace,
+    attachment,
+    onViewSourceInDebugger,
+    sourceMapService,
+    dispatch,
+  });
 }
 
 function formatReps(parameters) {
@@ -148,4 +111,4 @@ function formatReps(parameters) {
   );
 }
 
-module.exports.ConsoleApiCall = ConsoleApiCall;
+module.exports = ConsoleApiCall;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
index 38bdcc260a0e..0acf0349ab56 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
@@ -9,10 +9,9 @@
 // React & Redux
 const {
   createFactory,
-  DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon").MessageIcon);
+const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/message"));
 
 ConsoleCommand.displayName = "ConsoleCommand";
 
@@ -24,32 +23,20 @@ ConsoleCommand.propTypes = {
  * Displays input from the console.
  */
 function ConsoleCommand(props) {
-  const { message } = props;
-  const {source, type, level} = message;
+  const {
+    source,
+    type,
+    level,
+    messageText: messageBody
+  } = props.message;
 
-  const icon = MessageIcon({level});
-
-  const classes = ["message"];
-
-  classes.push(source);
-  classes.push(type);
-  classes.push(level);
-
-  return dom.div({
-    className: classes.join(" "),
-    ariaLive: "off",
-  },
-    // @TODO add timestamp
-    // @TODO add indent if necessary
-    icon,
-    dom.span({ className: "message-body-wrapper" },
-      dom.span({ className: "message-flex-body" },
-        dom.span({ className: "message-body devtools-monospace" },
-          message.messageText
-        )
-      )
-    )
-  );
+  const childProps = {
+    source,
+    type,
+    level,
+    messageBody
+  };
+  return Message(childProps);
 }
 
-module.exports.ConsoleCommand = ConsoleCommand;
+module.exports = ConsoleCommand;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js b/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
index c3745cb47052..d07089531e63 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
@@ -19,4 +19,4 @@ function DefaultRenderer(props) {
   );
 }
 
-module.exports.DefaultRenderer = DefaultRenderer;
+module.exports = DefaultRenderer;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
index 991717ca1d4c..d651fde12da4 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
@@ -9,11 +9,10 @@
 // React & Redux
 const {
   createFactory,
-  DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body").GripMessageBody);
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon").MessageIcon);
+const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/message"));
+const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/grip-message-body"));
 
 EvaluationResult.displayName = "EvaluationResult";
 
@@ -23,8 +22,11 @@ EvaluationResult.propTypes = {
 
 function EvaluationResult(props) {
   const { message } = props;
-  const {source, type, level} = message;
-  const icon = MessageIcon({level});
+  const {
+    source,
+    type,
+    level,
+  } = message;
 
   let messageBody;
   if (message.messageText) {
@@ -33,27 +35,16 @@ function EvaluationResult(props) {
     messageBody = GripMessageBody({grip: message.parameters});
   }
 
+  const topLevelClasses = ["cm-s-mozilla"];
 
-  const classes = ["message", "cm-s-mozilla"];
-
-  classes.push(source);
-  classes.push(type);
-  classes.push(level);
-
-  return dom.div({
-    className: classes.join(" ")
-  },
-    // @TODO add timestamp
-    // @TODO add indent if needed with console.group
-    icon,
-    dom.span({ className: "message-body-wrapper" },
-      dom.span({ className: "message-flex-body" },
-        dom.span({ className: "message-body devtools-monospace" },
-          messageBody
-        )
-      )
-    )
-  );
+  const childProps = {
+    source,
+    type,
+    level,
+    topLevelClasses,
+    messageBody,
+  };
+  return Message(childProps);
 }
 
-module.exports.EvaluationResult = EvaluationResult;
+module.exports = EvaluationResult;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
index 93ab5e1af9aa..f02829716272 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
@@ -12,64 +12,43 @@ const {
   DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon").MessageIcon);
-const CollapseButton = createFactory(require("devtools/client/webconsole/new-console-output/components/collapse-button").CollapseButton);
+const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/message"));
 const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
 
 NetworkEventMessage.displayName = "NetworkEventMessage";
 
 NetworkEventMessage.propTypes = {
   message: PropTypes.object.isRequired,
   openNetworkPanel: PropTypes.func.isRequired,
-  // @TODO: openLink will be used for mixed-content handling
-  openLink: PropTypes.func.isRequired,
-  open: PropTypes.bool.isRequired,
 };
 
 function NetworkEventMessage(props) {
-  const { dispatch, message, openNetworkPanel, open } = props;
-  const { actor, source, type, level, request, response, isXHR, totalTime } = message;
-  let { method, url } = request;
-  let { httpVersion, status, statusText } = response;
+  const { message, openNetworkPanel } = props;
+  const { actor, source, type, level, request, isXHR } = message;
 
-  let classes = ["message", "cm-s-mozilla"];
-
-  classes.push(source);
-  classes.push(type);
-  classes.push(level);
-
-  if (open) {
-    classes.push("open");
-  }
-
-  let statusInfo = "[]";
-
-  // @TODO: Status will be enabled after NetworkUpdateEvent packet arrives
-  if (httpVersion && status && statusText && totalTime) {
-    statusInfo = `[${httpVersion} ${status} ${statusText} ${totalTime}ms]`;
-  }
-
-  let xhr = l10n.getStr("webConsoleXhrIndicator");
+  const topLevelClasses = [ "cm-s-mozilla" ];
 
   function onUrlClick() {
     openNetworkPanel(actor);
   }
 
-  return dom.div({ className: classes.join(" ") },
-    // @TODO add timestamp
-    // @TODO add indent if necessary
-    MessageIcon({ level }),
-    dom.span({
-      className: "message-body-wrapper message-body devtools-monospace",
-      "aria-haspopup": "true"
-    },
-      dom.span({ className: "method" }, method),
-      isXHR ? dom.span({ className: "xhr" }, xhr) : null,
-      dom.a({ className: "url", title: url, onClick: onUrlClick },
-        url.replace(/\?.+/, ""))
-    )
-  );
+  const method = dom.span({className: "method" }, request.method);
+  const xhr = isXHR
+    ? dom.span({ className: "xhr" }, l10n.getStr("webConsoleXhrIndicator"))
+    : null;
+  const url = dom.a({ className: "url", title: request.url, onClick: onUrlClick },
+        request.url.replace(/\?.+/, ""));
+
+  const messageBody = dom.span({}, method, xhr, url);
+
+  const childProps = {
+    source,
+    type,
+    level,
+    topLevelClasses,
+    messageBody,
+  };
+  return Message(childProps);
 }
 
-module.exports.NetworkEventMessage = NetworkEventMessage;
+module.exports = NetworkEventMessage;
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
index 5a7297a9db58..51ca86898d02 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
@@ -9,16 +9,9 @@
 // React & Redux
 const {
   createFactory,
-  DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const FrameView = createFactory(require("devtools/client/shared/components/frame"));
-const StackTrace = createFactory(require("devtools/client/shared/components/stack-trace"));
-const CollapseButton = createFactory(require("devtools/client/webconsole/new-console-output/components/collapse-button").CollapseButton);
-const MessageRepeat = createFactory(require("devtools/client/webconsole/new-console-output/components/message-repeat").MessageRepeat);
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon").MessageIcon);
-
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/message"));
 
 PageError.displayName = "PageError";
 
@@ -32,69 +25,36 @@ PageError.defaultProps = {
 };
 
 function PageError(props) {
-  const { dispatch, message, open, sourceMapService, onViewSourceInDebugger } = props;
-  const { source, type, level, stacktrace, frame } = message;
+  const {
+    message,
+    open,
+    sourceMapService,
+    onViewSourceInDebugger
+  } = props;
+  const {
+    id: messageId,
+    source, type,
+    level,
+    messageText: messageBody,
+    repeat,
+    stacktrace,
+    frame
+  } = message;
 
-  const repeat = MessageRepeat({repeat: message.repeat});
-  const icon = MessageIcon({level});
-  const shouldRenderFrame = frame && frame.source !== "debugger eval code";
-  const location = dom.span({ className: "message-location devtools-monospace" },
-    shouldRenderFrame ? FrameView({
-      frame,
-      onClick: onViewSourceInDebugger,
-      showEmptyPathAsHost: true,
-      sourceMapService
-    }) : null
-  );
-
-  let collapse = "";
-  let attachment = "";
-  if (stacktrace) {
-    if (open) {
-      attachment = dom.div({ className: "stacktrace devtools-monospace" },
-        StackTrace({
-          stacktrace: stacktrace,
-          onViewSourceInDebugger: onViewSourceInDebugger
-        })
-      );
-    }
-
-    collapse = CollapseButton({
-      open,
-      onClick: function () {
-        if (open) {
-          dispatch(actions.messageClose(message.id));
-        } else {
-          dispatch(actions.messageOpen(message.id));
-        }
-      },
-    });
-  }
-
-  const classes = ["message"];
-  classes.push(source);
-  classes.push(type);
-  classes.push(level);
-  if (open === true) {
-    classes.push("open");
-  }
-
-  return dom.div({
-    className: classes.join(" ")
-  },
-    icon,
-    collapse,
-    dom.span({ className: "message-body-wrapper" },
-      dom.span({ className: "message-flex-body" },
-        dom.span({ className: "message-body devtools-monospace" },
-          message.messageText
-        ),
-        repeat,
-        location
-      ),
-      attachment
-    )
-  );
+  const childProps = {
+    messageId,
+    open,
+    source,
+    type,
+    level,
+    messageBody,
+    repeat,
+    frame,
+    stacktrace,
+    onViewSourceInDebugger,
+    sourceMapService,
+  };
+  return Message(childProps);
 }
 
-module.exports.PageError = PageError;
+module.exports = PageError;
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
new file mode 100644
index 000000000000..ae2c0eb84915
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -0,0 +1,128 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+// React & Redux
+const {
+  createFactory,
+  DOM: dom,
+  PropTypes
+} = require("devtools/client/shared/vendor/react");
+const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const CollapseButton = createFactory(require("devtools/client/webconsole/new-console-output/components/collapse-button"));
+const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/message-icon"));
+const MessageRepeat = createFactory(require("devtools/client/webconsole/new-console-output/components/message-repeat"));
+const FrameView = createFactory(require("devtools/client/shared/components/frame"));
+const StackTrace = createFactory(require("devtools/client/shared/components/stack-trace"));
+
+Message.displayName = "Message";
+
+Message.propTypes = {
+  open: PropTypes.bool,
+  source: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired,
+  level: PropTypes.string.isRequired,
+  topLevelClasses: PropTypes.array,
+  messageBody: PropTypes.any.isRequired,
+  repeat: PropTypes.any,
+  frame: PropTypes.any,
+  attachment: PropTypes.any,
+  stacktrace: PropTypes.any,
+  messageId: PropTypes.string,
+  onViewSourceInDebugger: PropTypes.func,
+  sourceMapService: PropTypes.any,
+};
+
+Message.defaultProps = {
+  topLevelClasses: [],
+};
+
+function Message(props) {
+  const {
+    messageId,
+    open,
+    source,
+    type,
+    level,
+    topLevelClasses,
+    messageBody,
+    frame,
+    stacktrace,
+    onViewSourceInDebugger,
+    sourceMapService,
+    dispatch,
+  } = props;
+
+  topLevelClasses.push("message", source, type, level);
+  if (open) {
+    topLevelClasses.push("open");
+  }
+
+  const icon = MessageIcon({level});
+
+  // Figure out if there is an expandable part to the message.
+  let attachment = null;
+  if (props.attachment) {
+    attachment = props.attachment;
+  } else if (stacktrace) {
+    if (open) {
+      attachment = dom.div({ className: "stacktrace devtools-monospace" },
+        StackTrace({
+          stacktrace: stacktrace,
+          onViewSourceInDebugger: onViewSourceInDebugger
+        })
+      );
+    }
+  }
+
+  // If there is an expandable part, make it collapsible.
+  let collapse = null;
+  if (attachment) {
+    collapse = CollapseButton({
+      open,
+      onClick: function () {
+        if (open) {
+          dispatch(actions.messageClose(messageId));
+        } else {
+          dispatch(actions.messageOpen(messageId));
+        }
+      },
+    });
+  }
+
+  const repeat = props.repeat ? MessageRepeat({repeat: props.repeat}) : null;
+
+  // Configure the location.
+  const shouldRenderFrame = frame && frame.source !== "debugger eval code";
+  const location = dom.span({ className: "message-location devtools-monospace" },
+    shouldRenderFrame ? FrameView({
+      frame,
+      onClick: onViewSourceInDebugger,
+      showEmptyPathAsHost: true,
+      sourceMapService
+    }) : null
+  );
+
+  return dom.div({ className: topLevelClasses.join(" ") },
+    // @TODO add timestamp
+    // @TODO add indent if necessary
+    icon,
+    collapse,
+    dom.span({ className: "message-body-wrapper" },
+      dom.span({ className: "message-flex-body" },
+        dom.span({ className: "message-body devtools-monospace" },
+          messageBody
+        ),
+        repeat,
+        location
+      ),
+      attachment
+    )
+  );
+}
+
+module.exports = Message;
diff --git a/devtools/client/webconsole/new-console-output/components/moz.build b/devtools/client/webconsole/new-console-output/components/moz.build
index 862751a4933b..ad162dc82549 100644
--- a/devtools/client/webconsole/new-console-output/components/moz.build
+++ b/devtools/client/webconsole/new-console-output/components/moz.build
@@ -17,5 +17,6 @@ DevToolsModules(
     'message-container.js',
     'message-icon.js',
     'message-repeat.js',
+    'message.js',
     'variables-view-link.js'
 )
diff --git a/devtools/client/webconsole/new-console-output/components/variables-view-link.js b/devtools/client/webconsole/new-console-output/components/variables-view-link.js
index 78b62dded411..4d79c322f033 100644
--- a/devtools/client/webconsole/new-console-output/components/variables-view-link.js
+++ b/devtools/client/webconsole/new-console-output/components/variables-view-link.js
@@ -31,4 +31,4 @@ function VariablesViewLink(props) {
   );
 }
 
-module.exports.VariablesViewLink = VariablesViewLink;
+module.exports = VariablesViewLink;
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
index d33ffa1a3830..5b64131a3c17 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
@@ -10,7 +10,7 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/console-api-call").ConsoleApiCall);
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/console-api-call"));
 
 // Test fakes.
 const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
diff --git a/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js b/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
index 78fe60015b85..4aad21a89254 100644
--- a/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
@@ -10,7 +10,7 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/evaluation-result").EvaluationResult);
+const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/evaluation-result"));
 
 // Test fakes.
 const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
index 978a96669208..bcb5f5c1b5d6 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
@@ -9,7 +9,7 @@ const { render, mount } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const Provider = createFactory(require("react-redux").Provider);
 
-const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button").FilterButton);
+const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button"));
 const FilterBar = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-bar"));
 const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
 const {
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
index 3eb0cdc7e497..3774da0b83c6 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
@@ -7,7 +7,7 @@ const { render } = require("enzyme");
 
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
-const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button").FilterButton);
+const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-button"));
 const { MESSAGE_LEVEL } = require("devtools/client/webconsole/new-console-output/constants");
 
 describe("FilterButton component:", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-container.test.js b/devtools/client/webconsole/new-console-output/test/components/message-container.test.js
index 3b2e9acfa513..06e8d6e0e1c6 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-container.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/message-container.test.js
@@ -11,9 +11,9 @@ const {
 
 // Components under test.
 const { MessageContainer } = require("devtools/client/webconsole/new-console-output/components/message-container");
-const { ConsoleApiCall } = require("devtools/client/webconsole/new-console-output/components/message-types/console-api-call");
-const { EvaluationResult } = require("devtools/client/webconsole/new-console-output/components/message-types/evaluation-result");
-const { PageError } = require("devtools/client/webconsole/new-console-output/components/message-types/page-error");
+const ConsoleApiCall = require("devtools/client/webconsole/new-console-output/components/message-types/console-api-call");
+const EvaluationResult = require("devtools/client/webconsole/new-console-output/components/message-types/evaluation-result");
+const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/page-error");
 
 // Test fakes.
 const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js b/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
index 971324a94de4..0244f08cf9cd 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
@@ -5,7 +5,7 @@
 const {
   MESSAGE_LEVEL,
 } = require("devtools/client/webconsole/new-console-output/constants");
-const { MessageIcon } = require("devtools/client/webconsole/new-console-output/components/message-icon");
+const MessageIcon = require("devtools/client/webconsole/new-console-output/components/message-icon");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/test/components/repeat.test.js b/devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
similarity index 87%
rename from devtools/client/webconsole/new-console-output/test/components/repeat.test.js
rename to devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
index 068decf7aefa..0257a3aad233 100644
--- a/devtools/client/webconsole/new-console-output/test/components/repeat.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
@@ -2,7 +2,7 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const { MessageRepeat } = require("devtools/client/webconsole/new-console-output/components/message-repeat");
+const MessageRepeat = require("devtools/client/webconsole/new-console-output/components/message-repeat");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js b/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
index 8365700a7ede..fd23b5f230ee 100644
--- a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
@@ -10,7 +10,7 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const NetworkEventMessage = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/network-event-message").NetworkEventMessage);
+const NetworkEventMessage = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/network-event-message"));
 
 // Test fakes.
 const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
diff --git a/devtools/client/webconsole/new-console-output/test/components/page-error.test.js b/devtools/client/webconsole/new-console-output/test/components/page-error.test.js
index c62af69d9edc..ef533c21a10e 100644
--- a/devtools/client/webconsole/new-console-output/test/components/page-error.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/page-error.test.js
@@ -7,7 +7,7 @@ const expect = require("expect");
 const { render } = require("enzyme");
 
 // Components under test.
-const { PageError } = require("devtools/client/webconsole/new-console-output/components/message-types/page-error");
+const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/page-error");
 
 // Test fakes.
 const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");

From 9cdc8b33fc7177c0d44dbdd35fbdc64e2548819b Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 36/57] Bug 1306622 - New console frontend: Fix stacktrace
 expandable closure. r=me

MozReview-Commit-ID: DugEHmQvbXd
---
 .../new-console-output/components/message.js        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index ae2c0eb84915..56592a47cef4 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -69,14 +69,11 @@ function Message(props) {
   if (props.attachment) {
     attachment = props.attachment;
   } else if (stacktrace) {
-    if (open) {
-      attachment = dom.div({ className: "stacktrace devtools-monospace" },
-        StackTrace({
-          stacktrace: stacktrace,
-          onViewSourceInDebugger: onViewSourceInDebugger
-        })
-      );
-    }
+    const child = open ? StackTrace({
+      stacktrace: stacktrace,
+      onViewSourceInDebugger: onViewSourceInDebugger
+    }) : null;
+    attachment = dom.div({ className: "stacktrace devtools-monospace" }, child);
   }
 
   // If there is an expandable part, make it collapsible.

From 70881adb5413997ec7e1254d90914042134d81c0 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <chevobbe.nicolas@gmail.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 37/57] Bug 1306727 - New console frontend: Add test for the
 location in consoleApiCall. r=linclark

MozReview-Commit-ID: H3eLp8FDQRN
---
 .../test/components/console-api-call.test.js                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
index 5b64131a3c17..0f5934ed44ad 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
@@ -27,6 +27,11 @@ describe("ConsoleAPICall component:", () => {
       expect(wrapper.find(".message-body").text()).toBe("foobar test");
       expect(wrapper.find(".objectBox-string").length).toBe(2);
       expect(wrapper.find("div.message.cm-s-mozilla span span.message-flex-body span.message-body.devtools-monospace").length).toBe(1);
+
+      // There should be the location
+      const locationLink = wrapper.find(`.message-location`);
+      expect(locationLink.length).toBe(1);
+      expect(locationLink.text()).toBe("test-tempfile.js:1:27");
     });
 
     it("renders repeat node", () => {

From 7ea7afa4f6e3d903b216ad2257532f58a8e7659d Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 38/57] Bug 1306099 - New console frontend: Fix scrolling.
 r=bgrins

MozReview-Commit-ID: 3xRTUTh53Bp
---
 .../components/console-output.js              |  39 +++-
 .../components/message-container.js           |  25 +--
 .../message-types/console-command.js          |   6 +-
 .../message-types/evaluation-result.js        |   1 +
 .../new-console-output/components/message.js  | 205 ++++++++++--------
 .../new-console-output/reducers/ui.js         |  15 +-
 .../new-console-output/selectors/ui.js        |  10 +-
 7 files changed, 173 insertions(+), 128 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/components/console-output.js b/devtools/client/webconsole/new-console-output/components/console-output.js
index f0c038ec8d57..2a5a2e36d801 100644
--- a/devtools/client/webconsole/new-console-output/components/console-output.js
+++ b/devtools/client/webconsole/new-console-output/components/console-output.js
@@ -13,6 +13,7 @@ const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 
 const { getAllMessages, getAllMessagesUiById, getAllMessagesTableDataById } = require("devtools/client/webconsole/new-console-output/selectors/messages");
+const { getScrollSetting } = require("devtools/client/webconsole/new-console-output/selectors/ui");
 const MessageContainer = createFactory(require("devtools/client/webconsole/new-console-output/components/message-container").MessageContainer);
 
 const ConsoleOutput = createClass({
@@ -27,25 +28,37 @@ const ConsoleOutput = createClass({
     onViewSourceInDebugger: PropTypes.func.isRequired,
     openNetworkPanel: PropTypes.func.isRequired,
     openLink: PropTypes.func.isRequired,
+    autoscroll: PropTypes.bool.isRequired,
   },
 
-  componentWillUpdate() {
-    let node = ReactDOM.findDOMNode(this);
-    if (node.lastChild) {
-      this.shouldScrollBottom = isScrolledToBottom(node.lastChild, node);
+  componentDidMount() {
+    scrollToBottom(this.outputNode);
+  },
+
+  componentWillUpdate(nextProps, nextState) {
+    if (!this.outputNode) {
+      return;
+    }
+
+    const outputNode = this.outputNode;
+
+    // Figure out if we are at the bottom. If so, then any new message should be scrolled
+    // into view.
+    if (this.props.autoscroll && outputNode.lastChild) {
+      this.shouldScrollBottom = isScrolledToBottom(outputNode.lastChild, outputNode);
     }
   },
 
   componentDidUpdate() {
     if (this.shouldScrollBottom) {
-      let node = ReactDOM.findDOMNode(this);
-      node.scrollTop = node.scrollHeight;
+      scrollToBottom(this.outputNode);
     }
   },
 
   render() {
     let {
       dispatch,
+      autoscroll,
       hudProxyClient,
       messages,
       messagesUi,
@@ -69,15 +82,26 @@ const ConsoleOutput = createClass({
           openLink,
           open: messagesUi.includes(message.id),
           tableData: messagesTableData.get(message.id),
+          autoscroll,
         })
       );
     });
     return (
-      dom.div({className: "webconsole-output"}, messageNodes)
+      dom.div({
+        className: "webconsole-output",
+        ref: node => {
+          this.outputNode = node;
+        },
+      }, messageNodes
+      )
     );
   }
 });
 
+function scrollToBottom(node) {
+  node.scrollTop = node.scrollHeight;
+}
+
 function isScrolledToBottom(outputNode, scrollNode) {
   let lastNodeHeight = outputNode.lastChild ?
                        outputNode.lastChild.clientHeight : 0;
@@ -90,6 +114,7 @@ function mapStateToProps(state) {
     messages: getAllMessages(state),
     messagesUi: getAllMessagesUiById(state),
     messagesTableData: getAllMessagesTableDataById(state),
+    autoscroll: getScrollSetting(state),
   };
 }
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-container.js b/devtools/client/webconsole/new-console-output/components/message-container.js
index f5c0c7a5909f..b3c4ed7c0cd5 100644
--- a/devtools/client/webconsole/new-console-output/components/message-container.js
+++ b/devtools/client/webconsole/new-console-output/components/message-container.js
@@ -38,6 +38,7 @@ const MessageContainer = createClass({
     openLink: PropTypes.func.isRequired,
     open: PropTypes.bool.isRequired,
     hudProxyClient: PropTypes.object.isRequired,
+    autoscroll: PropTypes.bool.isRequired,
   },
 
   getDefaultProps: function () {
@@ -54,30 +55,10 @@ const MessageContainer = createClass({
   },
 
   render() {
-    const {
-      dispatch,
-      message,
-      sourceMapService,
-      onViewSourceInDebugger,
-      openNetworkPanel,
-      openLink,
-      open,
-      tableData,
-      hudProxyClient,
-    } = this.props;
+    const { message } = this.props;
 
     let MessageComponent = createFactory(getMessageComponent(message));
-    return MessageComponent({
-      dispatch,
-      message,
-      sourceMapService,
-      onViewSourceInDebugger,
-      openNetworkPanel,
-      openLink,
-      open,
-      tableData,
-      hudProxyClient,
-    });
+    return MessageComponent(this.props);
   }
 });
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
index 0acf0349ab56..25f389b6d6f4 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
@@ -17,6 +17,7 @@ ConsoleCommand.displayName = "ConsoleCommand";
 
 ConsoleCommand.propTypes = {
   message: PropTypes.object.isRequired,
+  autoscroll: PropTypes.bool.isRequired,
 };
 
 /**
@@ -27,14 +28,15 @@ function ConsoleCommand(props) {
     source,
     type,
     level,
-    messageText: messageBody
+    messageText: messageBody,
   } = props.message;
 
   const childProps = {
     source,
     type,
     level,
-    messageBody
+    messageBody,
+    scrollToMessage: props.autoscroll,
   };
   return Message(childProps);
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
index d651fde12da4..2247f3c1a7fe 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
@@ -43,6 +43,7 @@ function EvaluationResult(props) {
     level,
     topLevelClasses,
     messageBody,
+    scrollToMessage: props.autoscroll,
   };
   return Message(childProps);
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index 56592a47cef4..34b66287de04 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -8,6 +8,7 @@
 
 // React & Redux
 const {
+  createClass,
   createFactory,
   DOM: dom,
   PropTypes
@@ -19,107 +20,123 @@ const MessageRepeat = createFactory(require("devtools/client/webconsole/new-cons
 const FrameView = createFactory(require("devtools/client/shared/components/frame"));
 const StackTrace = createFactory(require("devtools/client/shared/components/stack-trace"));
 
-Message.displayName = "Message";
+const Message = createClass({
+  displayName: "Message",
 
-Message.propTypes = {
-  open: PropTypes.bool,
-  source: PropTypes.string.isRequired,
-  type: PropTypes.string.isRequired,
-  level: PropTypes.string.isRequired,
-  topLevelClasses: PropTypes.array,
-  messageBody: PropTypes.any.isRequired,
-  repeat: PropTypes.any,
-  frame: PropTypes.any,
-  attachment: PropTypes.any,
-  stacktrace: PropTypes.any,
-  messageId: PropTypes.string,
-  onViewSourceInDebugger: PropTypes.func,
-  sourceMapService: PropTypes.any,
-};
+  propTypes: {
+    open: PropTypes.bool,
+    source: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired,
+    level: PropTypes.string.isRequired,
+    topLevelClasses: PropTypes.array,
+    messageBody: PropTypes.any.isRequired,
+    repeat: PropTypes.any,
+    frame: PropTypes.any,
+    attachment: PropTypes.any,
+    stacktrace: PropTypes.any,
+    messageId: PropTypes.string,
+    scrollToMessage: PropTypes.bool,
+    onViewSourceInDebugger: PropTypes.func,
+    sourceMapService: PropTypes.any,
+  },
 
-Message.defaultProps = {
-  topLevelClasses: [],
-};
+  getDefaultProps() {
+    return {
+      topLevelClasses: [],
+    };
+  },
 
-function Message(props) {
-  const {
-    messageId,
-    open,
-    source,
-    type,
-    level,
-    topLevelClasses,
-    messageBody,
-    frame,
-    stacktrace,
-    onViewSourceInDebugger,
-    sourceMapService,
-    dispatch,
-  } = props;
+  componentDidMount() {
+    if (this.props.scrollToMessage && this.messageNode) {
+      this.messageNode.scrollIntoView();
+    }
+  },
 
-  topLevelClasses.push("message", source, type, level);
-  if (open) {
-    topLevelClasses.push("open");
-  }
-
-  const icon = MessageIcon({level});
-
-  // Figure out if there is an expandable part to the message.
-  let attachment = null;
-  if (props.attachment) {
-    attachment = props.attachment;
-  } else if (stacktrace) {
-    const child = open ? StackTrace({
-      stacktrace: stacktrace,
-      onViewSourceInDebugger: onViewSourceInDebugger
-    }) : null;
-    attachment = dom.div({ className: "stacktrace devtools-monospace" }, child);
-  }
-
-  // If there is an expandable part, make it collapsible.
-  let collapse = null;
-  if (attachment) {
-    collapse = CollapseButton({
+  render() {
+    const {
+      messageId,
       open,
-      onClick: function () {
-        if (open) {
-          dispatch(actions.messageClose(messageId));
-        } else {
-          dispatch(actions.messageOpen(messageId));
-        }
-      },
-    });
-  }
-
-  const repeat = props.repeat ? MessageRepeat({repeat: props.repeat}) : null;
-
-  // Configure the location.
-  const shouldRenderFrame = frame && frame.source !== "debugger eval code";
-  const location = dom.span({ className: "message-location devtools-monospace" },
-    shouldRenderFrame ? FrameView({
+      source,
+      type,
+      level,
+      topLevelClasses,
+      messageBody,
       frame,
-      onClick: onViewSourceInDebugger,
-      showEmptyPathAsHost: true,
-      sourceMapService
-    }) : null
-  );
+      stacktrace,
+      onViewSourceInDebugger,
+      sourceMapService,
+      dispatch,
+    } = this.props;
 
-  return dom.div({ className: topLevelClasses.join(" ") },
-    // @TODO add timestamp
-    // @TODO add indent if necessary
-    icon,
-    collapse,
-    dom.span({ className: "message-body-wrapper" },
-      dom.span({ className: "message-flex-body" },
-        dom.span({ className: "message-body devtools-monospace" },
-          messageBody
+    topLevelClasses.push("message", source, type, level);
+    if (open) {
+      topLevelClasses.push("open");
+    }
+
+    const icon = MessageIcon({level});
+
+    // Figure out if there is an expandable part to the message.
+    let attachment = null;
+    if (this.props.attachment) {
+      attachment = this.props.attachment;
+    } else if (stacktrace) {
+      const child = open ? StackTrace({
+        stacktrace: stacktrace,
+        onViewSourceInDebugger: onViewSourceInDebugger
+      }) : null;
+      attachment = dom.div({ className: "stacktrace devtools-monospace" }, child);
+    }
+
+    // If there is an expandable part, make it collapsible.
+    let collapse = null;
+    if (attachment) {
+      collapse = CollapseButton({
+        open,
+        onClick: function () {
+          if (open) {
+            dispatch(actions.messageClose(messageId));
+          } else {
+            dispatch(actions.messageOpen(messageId));
+          }
+        },
+      });
+    }
+
+    const repeat = this.props.repeat ? MessageRepeat({repeat: this.props.repeat}) : null;
+
+    // Configure the location.
+    const shouldRenderFrame = frame && frame.source !== "debugger eval code";
+    const location = dom.span({ className: "message-location devtools-monospace" },
+      shouldRenderFrame ? FrameView({
+        frame,
+        onClick: onViewSourceInDebugger,
+        showEmptyPathAsHost: true,
+        sourceMapService
+      }) : null
+    );
+
+    return dom.div({
+      className: topLevelClasses.join(" "),
+      ref: node => {
+        this.messageNode = node;
+      }
+    },
+      // @TODO add timestamp
+      // @TODO add indent if necessary
+      icon,
+      collapse,
+      dom.span({ className: "message-body-wrapper" },
+        dom.span({ className: "message-flex-body" },
+          dom.span({ className: "message-body devtools-monospace" },
+            messageBody
+          ),
+          repeat,
+          location
         ),
-        repeat,
-        location
-      ),
-      attachment
-    )
-  );
-}
+        attachment
+      )
+    );
+  }
+});
 
 module.exports = Message;
diff --git a/devtools/client/webconsole/new-console-output/reducers/ui.js b/devtools/client/webconsole/new-console-output/reducers/ui.js
index bcc1bf725b52..aa91dceebec5 100644
--- a/devtools/client/webconsole/new-console-output/reducers/ui.js
+++ b/devtools/client/webconsole/new-console-output/reducers/ui.js
@@ -5,17 +5,28 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const {
+  FILTER_BAR_TOGGLE,
+  MESSAGE_ADD,
+} = require("devtools/client/webconsole/new-console-output/constants");
 const Immutable = require("devtools/client/shared/vendor/immutable");
 
 const UiState = Immutable.Record({
   filterBarVisible: false,
   filteredMessageVisible: false,
+  autoscroll: true,
 });
 
 function ui(state = new UiState(), action) {
+  // Autoscroll should be set for all action types. If the last action was not message
+  // add, then turn it off. This prevents us from scrolling after someone toggles a
+  // filter, or to the bottom of the attachement when an expandable message at the bottom
+  // of the list is expanded. It does depend on the MESSAGE_ADD action being the last in
+  // its batch, though.
+  state = state.set("autoscroll", action.type == MESSAGE_ADD);
+
   switch (action.type) {
-    case constants.FILTER_BAR_TOGGLE:
+    case FILTER_BAR_TOGGLE:
       return state.set("filterBarVisible", !state.filterBarVisible);
   }
 
diff --git a/devtools/client/webconsole/new-console-output/selectors/ui.js b/devtools/client/webconsole/new-console-output/selectors/ui.js
index 32d104815d00..c9729e92d4c5 100644
--- a/devtools/client/webconsole/new-console-output/selectors/ui.js
+++ b/devtools/client/webconsole/new-console-output/selectors/ui.js
@@ -3,10 +3,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 "use strict";
 
 function getAllUi(state) {
   return state.ui;
 }
 
-exports.getAllUi = getAllUi;
+function getScrollSetting(state) {
+  return getAllUi(state).autoscroll;
+}
+
+module.exports = {
+  getAllUi,
+  getScrollSetting,
+};

From b1b922dcdb3e5e73d55be3f43dd34147b594d1a1 Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 39/57] Bug 1306775 - New console frontend: Fix classes on page
 errors and console commands. r=me

MozReview-Commit-ID: 97gjsvbKt1d
---
 .../components/message-types/console-command.js           | 1 +
 .../components/message-types/page-error.js                | 4 +++-
 .../webconsole/new-console-output/components/message.js   | 8 +-------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
index 25f389b6d6f4..9a1c26d07033 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
@@ -35,6 +35,7 @@ function ConsoleCommand(props) {
     source,
     type,
     level,
+    topLevelClasses: [],
     messageBody,
     scrollToMessage: props.autoscroll,
   };
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
index 51ca86898d02..abf81e8de6a2 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
@@ -33,7 +33,8 @@ function PageError(props) {
   } = props;
   const {
     id: messageId,
-    source, type,
+    source,
+    type,
     level,
     messageText: messageBody,
     repeat,
@@ -47,6 +48,7 @@ function PageError(props) {
     source,
     type,
     level,
+    topLevelClasses: [],
     messageBody,
     repeat,
     frame,
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index 34b66287de04..cc0df8c22e32 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -28,7 +28,7 @@ const Message = createClass({
     source: PropTypes.string.isRequired,
     type: PropTypes.string.isRequired,
     level: PropTypes.string.isRequired,
-    topLevelClasses: PropTypes.array,
+    topLevelClasses: PropTypes.array.isRequired,
     messageBody: PropTypes.any.isRequired,
     repeat: PropTypes.any,
     frame: PropTypes.any,
@@ -40,12 +40,6 @@ const Message = createClass({
     sourceMapService: PropTypes.any,
   },
 
-  getDefaultProps() {
-    return {
-      topLevelClasses: [],
-    };
-  },
-
   componentDidMount() {
     if (this.props.scrollToMessage && this.messageNode) {
       this.messageNode.scrollIntoView();

From 602cb980ef4b30bd25c183ffc451a2d3eb01c74b Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <chevobbe.nicolas@gmail.com>
Date: Sun, 2 Oct 2016 15:16:49 -0700
Subject: [PATCH 40/57] Bug 1306781 - New console frontend: Add title on repeat
 element. r=linclark

MozReview-Commit-ID: L10G6ShRuXR
---
 .../components/message-repeat.js               | 10 +++++++++-
 .../test/components/console-api-call.test.js   |  1 +
 .../test/fixtures/PluralForm.js                | 18 ++++++++++++++++++
 .../new-console-output/test/requireHelper.js   |  2 ++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js

diff --git a/devtools/client/webconsole/new-console-output/components/message-repeat.js b/devtools/client/webconsole/new-console-output/components/message-repeat.js
index 4f1236e93ab6..1820340ea3cc 100644
--- a/devtools/client/webconsole/new-console-output/components/message-repeat.js
+++ b/devtools/client/webconsole/new-console-output/components/message-repeat.js
@@ -12,6 +12,8 @@ const {
   DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
+const { PluralForm } = require("devtools/shared/plural-form");
+const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
 
 MessageRepeat.displayName = "MessageRepeat";
 
@@ -22,7 +24,13 @@ MessageRepeat.propTypes = {
 function MessageRepeat(props) {
   const { repeat } = props;
   const visibility = repeat > 1 ? "visible" : "hidden";
-  return dom.span({className: "message-repeats", style: {visibility}}, repeat);
+
+  return dom.span({
+    className: "message-repeats",
+    style: {visibility},
+    title: PluralForm.get(repeat, l10n.getStr("messageRepeats.tooltip2"))
+      .replace("#1", repeat)
+  }, repeat);
 }
 
 module.exports = MessageRepeat;
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
index 0f5934ed44ad..6d893cf9eee6 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
@@ -41,6 +41,7 @@ describe("ConsoleAPICall component:", () => {
       const wrapper = render(ConsoleApiCall({ message, onViewSourceInDebugger }));
 
       expect(wrapper.find(".message-repeats").text()).toBe("107");
+      expect(wrapper.find(".message-repeats").prop("title")).toBe("107 repeats");
 
       expect(wrapper.find("span > span.message-flex-body > span.message-body.devtools-monospace + span.message-repeats").length).toBe(1);
     });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js b/devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js
new file mode 100644
index 000000000000..9ab3ad3ec226
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js
@@ -0,0 +1,18 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+module.exports = {
+  PluralForm: {
+    get: function (occurence, str) {
+      // @TODO Remove when loading the actual strings from webconsole.properties
+      // is done in the L10n fixture.
+      if (str === "messageRepeats.tooltip2") {
+        return `${occurence} repeats`;
+      }
+
+      return str;
+    }
+  }
+};
diff --git a/devtools/client/webconsole/new-console-output/test/requireHelper.js b/devtools/client/webconsole/new-console-output/test/requireHelper.js
index 51c733e78a2e..ac6205808204 100644
--- a/devtools/client/webconsole/new-console-output/test/requireHelper.js
+++ b/devtools/client/webconsole/new-console-output/test/requireHelper.js
@@ -27,6 +27,8 @@ requireHacker.global_hook("default", path => {
       return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils")`;
     case "devtools/shared/l10n":
       return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper")`;
+    case "devtools/shared/plural-form":
+      return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/PluralForm")`;
     case "Services":
     case "Services.default":
       return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/Services")`;

From 3618c529bcc40f8b8b68e8ed8fa8d28bfc44a9ca Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:50 -0700
Subject: [PATCH 41/57] Bug 1306751 - New console frontend: Emit new-message
 from componentDidMount. r=bgrins

MozReview-Commit-ID: 1JS6FcDU9qr
---
 devtools/client/webconsole/jsterm.js                 |  2 +-
 .../new-console-output/components/console-output.js  |  3 +++
 .../components/message-types/console-api-call.js     |  4 +++-
 .../components/message-types/evaluation-result.js    |  2 ++
 .../message-types/network-event-message.js           |  3 ++-
 .../components/message-types/page-error.js           |  4 +++-
 .../new-console-output/components/message.js         |  7 +++++--
 .../client/webconsole/new-console-output/main.js     |  4 ++--
 .../new-console-output/new-console-output-wrapper.js | 12 +++++-------
 devtools/client/webconsole/webconsole.js             |  5 +----
 10 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/devtools/client/webconsole/jsterm.js b/devtools/client/webconsole/jsterm.js
index 802a1b56703c..b07e07216f2e 100644
--- a/devtools/client/webconsole/jsterm.js
+++ b/devtools/client/webconsole/jsterm.js
@@ -377,7 +377,7 @@ JSTerm.prototype = {
 
     if (this.hud.NEW_CONSOLE_OUTPUT_ENABLED) {
       this.hud.newConsoleOutput.dispatchMessageAdd(response);
-      callback && callback(this.hud.newConsoleOutput.getLastMessage());
+      callback && callback();
       return;
     }
     let msg = new Messages.JavaScriptEvalOutput(response,
diff --git a/devtools/client/webconsole/new-console-output/components/console-output.js b/devtools/client/webconsole/new-console-output/components/console-output.js
index 2a5a2e36d801..bb30b8e63187 100644
--- a/devtools/client/webconsole/new-console-output/components/console-output.js
+++ b/devtools/client/webconsole/new-console-output/components/console-output.js
@@ -28,6 +28,7 @@ const ConsoleOutput = createClass({
     onViewSourceInDebugger: PropTypes.func.isRequired,
     openNetworkPanel: PropTypes.func.isRequired,
     openLink: PropTypes.func.isRequired,
+    emitNewMessage: PropTypes.func.isRequired,
     autoscroll: PropTypes.bool.isRequired,
   },
 
@@ -67,6 +68,7 @@ const ConsoleOutput = createClass({
       onViewSourceInDebugger,
       openNetworkPanel,
       openLink,
+      emitNewMessage,
     } = this.props;
 
     let messageNodes = messages.map((message) => {
@@ -80,6 +82,7 @@ const ConsoleOutput = createClass({
           onViewSourceInDebugger,
           openNetworkPanel,
           openLink,
+          emitNewMessage,
           open: messagesUi.includes(message.id),
           tableData: messagesTableData.get(message.id),
           autoscroll,
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js b/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
index cb175fc14119..7c9ddcb894fe 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
@@ -39,7 +39,8 @@ function ConsoleApiCall(props) {
     onViewSourceInDebugger,
     open,
     hudProxyClient,
-    tableData
+    tableData,
+    emitNewMessage,
   } = props;
   const {
     id: messageId,
@@ -93,6 +94,7 @@ function ConsoleApiCall(props) {
     attachment,
     onViewSourceInDebugger,
     sourceMapService,
+    emitNewMessage,
     dispatch,
   });
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
index 2247f3c1a7fe..7c51be3d74aa 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
@@ -26,6 +26,7 @@ function EvaluationResult(props) {
     source,
     type,
     level,
+    emitNewMessage,
   } = message;
 
   let messageBody;
@@ -44,6 +45,7 @@ function EvaluationResult(props) {
     topLevelClasses,
     messageBody,
     scrollToMessage: props.autoscroll,
+    emitNewMessage,
   };
   return Message(childProps);
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
index f02829716272..0fdfc0c13e4d 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
@@ -23,7 +23,7 @@ NetworkEventMessage.propTypes = {
 };
 
 function NetworkEventMessage(props) {
-  const { message, openNetworkPanel } = props;
+  const { message, openNetworkPanel, emitNewMessage } = props;
   const { actor, source, type, level, request, isXHR } = message;
 
   const topLevelClasses = [ "cm-s-mozilla" ];
@@ -47,6 +47,7 @@ function NetworkEventMessage(props) {
     level,
     topLevelClasses,
     messageBody,
+    emitNewMessage,
   };
   return Message(childProps);
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
index abf81e8de6a2..280656d1bb68 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
@@ -29,7 +29,8 @@ function PageError(props) {
     message,
     open,
     sourceMapService,
-    onViewSourceInDebugger
+    onViewSourceInDebugger,
+    emitNewMessage,
   } = props;
   const {
     id: messageId,
@@ -55,6 +56,7 @@ function PageError(props) {
     stacktrace,
     onViewSourceInDebugger,
     sourceMapService,
+    emitNewMessage,
   };
   return Message(childProps);
 }
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index cc0df8c22e32..0b6ebfaa9d4d 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -41,8 +41,11 @@ const Message = createClass({
   },
 
   componentDidMount() {
-    if (this.props.scrollToMessage && this.messageNode) {
-      this.messageNode.scrollIntoView();
+    if (this.messageNode && this.props.emitNewMessage) {
+      this.props.emitNewMessage(this.messageNode);
+      if (this.props.scrollToMessage) {
+        this.messageNode.scrollIntoView();
+      }
     }
   },
 
diff --git a/devtools/client/webconsole/new-console-output/main.js b/devtools/client/webconsole/new-console-output/main.js
index 6cd8a8f76022..b06b9db08818 100644
--- a/devtools/client/webconsole/new-console-output/main.js
+++ b/devtools/client/webconsole/new-console-output/main.js
@@ -18,7 +18,7 @@ const NewConsoleOutputWrapper = BrowserLoader({
   baseURI: "resource://devtools/client/webconsole/new-console-output/",
   window}).require("./new-console-output-wrapper");
 
-this.NewConsoleOutput = function (parentNode, jsterm, toolbox, owner) {
+this.NewConsoleOutput = function (parentNode, jsterm, toolbox, owner, emitNewMessage) {
   console.log("Creating NewConsoleOutput", parentNode, NewConsoleOutputWrapper);
-  return new NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner);
+  return new NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner, emitNewMessage);
 };
diff --git a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
index aeddf6167389..2dd6ae47207d 100644
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
@@ -17,7 +17,6 @@ const FilterBar = React.createFactory(require("devtools/client/webconsole/new-co
 const store = configureStore();
 
 function NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner) {
-  this.parentNode = parentNode;
   this.parentNode = parentNode;
   this.jsterm = jsterm;
   this.toolbox = toolbox;
@@ -46,6 +45,11 @@ NewConsoleOutputWrapper.prototype = {
       openLink: (url) => {
         this.owner.openLink(url);
       },
+      emitNewMessage: (node) => {
+        this.jsterm.hud.emit("new-messages", new Set([{
+          node
+        }]));
+      },
     });
     let filterBar = FilterBar({});
     let provider = React.createElement(
@@ -69,12 +73,6 @@ NewConsoleOutputWrapper.prototype = {
   dispatchMessagesClear: () => {
     store.dispatch(actions.messagesClear());
   },
-  getLastMessage: function() {
-    // Return the last message in the DOM as the message that was just dispatched. This may not
-    // always be correct in the case of filtered messages, but it's close enough for our tests.
-    let messageNodes = this.parentNode.querySelectorAll(".message");
-    return messageNodes[messageNodes.length - 1]
-  },
 };
 
 // Exports from this module
diff --git a/devtools/client/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js
index 9964ca12f5fa..90d7d9a1dd3d 100644
--- a/devtools/client/webconsole/webconsole.js
+++ b/devtools/client/webconsole/webconsole.js
@@ -591,6 +591,7 @@ WebConsoleFrame.prototype = {
       this.outputNode.parentNode.appendChild(this.experimentalOutputNode);
       // @TODO Once the toolbox has been converted to React, see if passing
       // in JSTerm is still necessary.
+
       this.newConsoleOutput = new this.window.NewConsoleOutput(
         this.experimentalOutputNode, this.jsterm, toolbox, this.owner);
       console.log("Created newConsoleOutput", this.newConsoleOutput);
@@ -3266,10 +3267,6 @@ WebConsoleConnectionProxy.prototype = {
    */
   dispatchMessageAdd: function(packet) {
     this.webConsoleFrame.newConsoleOutput.dispatchMessageAdd(packet);
-    this.webConsoleFrame.emit("new-messages", new Set([{
-      response: packet,
-      node: this.webConsoleFrame.newConsoleOutput.getLastMessage(),
-    }]));
   },
 
   /**

From bbfbcfb4f681cb1716861a06084c3f42fec81e79 Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:50 -0700
Subject: [PATCH 42/57] Bug 1306783 - New console frontend: Fix performance
 issue when adding lots of messages. r=bgrins; r=nchevobbe

MozReview-Commit-ID: HdU1OntWPhq
---
 .../new-console-output-wrapper.js                 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
index 2dd6ae47207d..bd690aeed56c 100644
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
@@ -15,6 +15,8 @@ const ConsoleOutput = React.createFactory(require("devtools/client/webconsole/ne
 const FilterBar = React.createFactory(require("devtools/client/webconsole/new-console-output/components/filter-bar"));
 
 const store = configureStore();
+let queuedActions = [];
+let throttledDispatchTimeout = false;
 
 function NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner) {
   this.parentNode = parentNode;
@@ -64,7 +66,7 @@ NewConsoleOutputWrapper.prototype = {
     this.body = ReactDOM.render(provider, this.parentNode);
   },
   dispatchMessageAdd: (message) => {
-    store.dispatch(actions.messageAdd(message));
+    batchedMessageAdd(actions.messageAdd(message));
   },
   dispatchMessagesAdd: (messages) => {
     const batchedActions = messages.map(message => actions.messageAdd(message));
@@ -75,5 +77,16 @@ NewConsoleOutputWrapper.prototype = {
   },
 };
 
+function batchedMessageAdd(action) {
+  queuedActions.push(action);
+  if (!throttledDispatchTimeout) {
+    throttledDispatchTimeout = setTimeout(() => {
+      store.dispatch(actions.batchActions(queuedActions));
+      queuedActions = [];
+      throttledDispatchTimeout = null;
+    }, 50);
+  }
+}
+
 // Exports from this module
 module.exports = NewConsoleOutputWrapper;

From 3468e59ee7b26ef579aa65b753e0e44abf33082e Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Sun, 2 Oct 2016 15:16:50 -0700
Subject: [PATCH 43/57] Bug 1306783 - Skip test_render_perf.html
 temporarily;r=linclark

MozReview-Commit-ID: 8MxjccwSIdO
---
 .../client/webconsole/new-console-output/test/chrome/chrome.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/client/webconsole/new-console-output/test/chrome/chrome.ini b/devtools/client/webconsole/new-console-output/test/chrome/chrome.ini
index e866e3594700..0543ae5c6dc7 100644
--- a/devtools/client/webconsole/new-console-output/test/chrome/chrome.ini
+++ b/devtools/client/webconsole/new-console-output/test/chrome/chrome.ini
@@ -4,4 +4,4 @@ support-files =
   head.js
 
 [test_render_perf.html]
-skip-if = debug
+skip-if = true # Bug 1306783

From 0548ed82cfb9da74f5d8d4907e085b4c6e18e449 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 3 Oct 2016 10:22:26 -0400
Subject: [PATCH 44/57] Bug 1305786 -  Add initial react/redux boilerplate for
 creating a new layout panel r=honza

---
 devtools/client/framework/toolbox.js          |  4 ++
 devtools/client/inspector/inspector.js        | 19 ++++++++++
 devtools/client/inspector/inspector.xhtml     |  5 +++
 .../client/inspector/layout/actions/index.js  |  5 +++
 .../client/inspector/layout/actions/moz.build |  5 +++
 .../client/inspector/layout/components/App.js | 24 ++++++++++++
 .../inspector/layout/components/moz.build     |  9 +++++
 devtools/client/inspector/layout/layout.js    | 37 +++++++++++++++++++
 devtools/client/inspector/layout/moz.build    | 17 +++++++++
 .../client/inspector/layout/reducers/grids.js | 21 +++++++++++
 .../client/inspector/layout/reducers/index.js |  7 ++++
 .../inspector/layout/reducers/moz.build       | 10 +++++
 devtools/client/inspector/layout/store.js     | 33 +++++++++++++++++
 devtools/client/inspector/layout/types.js     |  5 +++
 devtools/client/inspector/moz.build           |  1 +
 .../client/locales/en-US/inspector.properties |  5 +++
 devtools/client/preferences/devtools.js       | 15 +++++---
 17 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 devtools/client/inspector/layout/actions/index.js
 create mode 100644 devtools/client/inspector/layout/actions/moz.build
 create mode 100644 devtools/client/inspector/layout/components/App.js
 create mode 100644 devtools/client/inspector/layout/components/moz.build
 create mode 100644 devtools/client/inspector/layout/layout.js
 create mode 100644 devtools/client/inspector/layout/moz.build
 create mode 100644 devtools/client/inspector/layout/reducers/grids.js
 create mode 100644 devtools/client/inspector/layout/reducers/index.js
 create mode 100644 devtools/client/inspector/layout/reducers/moz.build
 create mode 100644 devtools/client/inspector/layout/store.js
 create mode 100644 devtools/client/inspector/layout/types.js

diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 2a3e58ae6f45..8d45cca6da99 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -486,6 +486,10 @@ Toolbox.prototype = {
     return this.browserRequire("devtools/client/shared/vendor/react-dom");
   },
 
+  get ReactRedux() {
+    return this.browserRequire("devtools/client/shared/vendor/react-redux");
+  },
+
   // Return HostType id for telemetry
   _getTelemetryHostId: function () {
     switch (this.hostType) {
diff --git a/devtools/client/inspector/inspector.js b/devtools/client/inspector/inspector.js
index bea19cebae57..ddf5d1f406c5 100644
--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@@ -29,6 +29,7 @@ const {ComputedViewTool} = require("devtools/client/inspector/computed/computed"
 const {FontInspector} = require("devtools/client/inspector/fonts/fonts");
 const {HTMLBreadcrumbs} = require("devtools/client/inspector/breadcrumbs");
 const {InspectorSearch} = require("devtools/client/inspector/inspector-search");
+const {LayoutViewTool} = require("devtools/client/inspector/layout/layout");
 const {MarkupView} = require("devtools/client/inspector/markup/markup");
 const {RuleViewTool} = require("devtools/client/inspector/rules/rules");
 const {ToolSidebar} = require("devtools/client/inspector/toolsidebar");
@@ -417,6 +418,10 @@ Inspector.prototype = {
     return this._toolbox.ReactDOM;
   },
 
+  get ReactRedux() {
+    return this._toolbox.ReactRedux;
+  },
+
   get browserRequire() {
     return this._toolbox.browserRequire;
   },
@@ -559,6 +564,16 @@ Inspector.prototype = {
     this.ruleview = new RuleViewTool(this, this.panelWin);
     this.computedview = new ComputedViewTool(this, this.panelWin);
 
+    if (Services.prefs.getBoolPref("devtools.layoutview.enabled")) {
+      this.sidebar.addExistingTab(
+        "layoutview",
+        INSPECTOR_L10N.getStr("inspector.sidebar.layoutViewTitle"),
+        defaultTab == "layoutview"
+      );
+
+      this.layoutview = new LayoutViewTool(this, this.panelWin);
+    }
+
     if (this.target.form.animationsActor) {
       this.sidebar.addFrameTab(
         "animationinspector",
@@ -866,6 +881,10 @@ Inspector.prototype = {
       this.computedview.destroy();
     }
 
+    if (this.layoutview) {
+      this.layoutview.destroy();
+    }
+
     if (this.fontInspector) {
       this.fontInspector.destroy();
     }
diff --git a/devtools/client/inspector/inspector.xhtml b/devtools/client/inspector/inspector.xhtml
index 0c3f34333cf4..98ce3455c80c 100644
--- a/devtools/client/inspector/inspector.xhtml
+++ b/devtools/client/inspector/inspector.xhtml
@@ -184,6 +184,11 @@
         </div>
       </div>
 
+      <div id="sidebar-panel-layoutview" class="devtools-monospace theme-sidebar inspector-tabpanel"
+           data-localization-bundle="devtools/locale/inspector.properties">
+        <div id="layout-root"></div>
+      </div>
+
       <div id="sidebar-panel-fontinspector" class="devtools-monospace theme-sidebar inspector-tabpanel"
                 data-localization-bundle="devtools/locale/font-inspector.properties">
         <div class="devtools-toolbar">
diff --git a/devtools/client/inspector/layout/actions/index.js b/devtools/client/inspector/layout/actions/index.js
new file mode 100644
index 000000000000..66735cddb6f1
--- /dev/null
+++ b/devtools/client/inspector/layout/actions/index.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
diff --git a/devtools/client/inspector/layout/actions/moz.build b/devtools/client/inspector/layout/actions/moz.build
new file mode 100644
index 000000000000..568f361a5423
--- /dev/null
+++ b/devtools/client/inspector/layout/actions/moz.build
@@ -0,0 +1,5 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
diff --git a/devtools/client/inspector/layout/components/App.js b/devtools/client/inspector/layout/components/App.js
new file mode 100644
index 000000000000..4d1454a8fd08
--- /dev/null
+++ b/devtools/client/inspector/layout/components/App.js
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { createClass, DOM: dom } = require("devtools/client/shared/vendor/react");
+const { connect } = require("devtools/client/shared/vendor/react-redux");
+
+let App = createClass({
+
+  displayName: "App",
+
+  render() {
+    return dom.div(
+      {
+        id: "app",
+      }
+    );
+  },
+
+});
+
+module.exports = connect(state => state)(App);
diff --git a/devtools/client/inspector/layout/components/moz.build b/devtools/client/inspector/layout/components/moz.build
new file mode 100644
index 000000000000..1821a18a88ad
--- /dev/null
+++ b/devtools/client/inspector/layout/components/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DevToolsModules(
+    'App.js',
+)
diff --git a/devtools/client/inspector/layout/layout.js b/devtools/client/inspector/layout/layout.js
new file mode 100644
index 000000000000..d28464d53d4f
--- /dev/null
+++ b/devtools/client/inspector/layout/layout.js
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+function LayoutViewTool(inspector, window) {
+  this.inspector = inspector;
+  this.document = window.document;
+  this.store = null;
+
+  this.init();
+}
+
+LayoutViewTool.prototype = {
+
+  init() {
+    const { React, ReactDOM, ReactRedux, browserRequire } = this.inspector;
+
+    const Store = browserRequire("devtools/client/inspector/layout/store");
+    const App = React.createFactory(
+      browserRequire("devtools/client/inspector/layout/components/App"));
+
+    let store = this.store = Store();
+    let provider = React.createElement(ReactRedux.Provider, { store }, App());
+    ReactDOM.render(provider, this.document.querySelector("#layout-root"));
+  },
+
+  destroy() {
+    this.inspector = null;
+    this.document = null;
+    this.store = null;
+  },
+
+};
+
+exports.LayoutViewTool = LayoutViewTool;
diff --git a/devtools/client/inspector/layout/moz.build b/devtools/client/inspector/layout/moz.build
new file mode 100644
index 000000000000..8bbcad9a5c16
--- /dev/null
+++ b/devtools/client/inspector/layout/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DIRS += [
+    'actions',
+    'components',
+    'reducers',
+]
+
+DevToolsModules(
+    'layout.js',
+    'store.js',
+    'types.js',
+)
diff --git a/devtools/client/inspector/layout/reducers/grids.js b/devtools/client/inspector/layout/reducers/grids.js
new file mode 100644
index 000000000000..3a1c26fd4cd5
--- /dev/null
+++ b/devtools/client/inspector/layout/reducers/grids.js
@@ -0,0 +1,21 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const INITIAL_GRIDS = {
+
+};
+
+let reducers = {
+
+};
+
+module.exports = function (grids = INITIAL_GRIDS, action) {
+  let reducer = reducers[action.type];
+  if (!reducer) {
+    return grids;
+  }
+  return reducer(grids, action);
+};
diff --git a/devtools/client/inspector/layout/reducers/index.js b/devtools/client/inspector/layout/reducers/index.js
new file mode 100644
index 000000000000..3fed406d7382
--- /dev/null
+++ b/devtools/client/inspector/layout/reducers/index.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+exports.grids = require("./grids");
diff --git a/devtools/client/inspector/layout/reducers/moz.build b/devtools/client/inspector/layout/reducers/moz.build
new file mode 100644
index 000000000000..7c695591439b
--- /dev/null
+++ b/devtools/client/inspector/layout/reducers/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DevToolsModules(
+    'grids.js',
+    'index.js',
+)
diff --git a/devtools/client/inspector/layout/store.js b/devtools/client/inspector/layout/store.js
new file mode 100644
index 000000000000..5069dda2649e
--- /dev/null
+++ b/devtools/client/inspector/layout/store.js
@@ -0,0 +1,33 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { combineReducers } = require("devtools/client/shared/vendor/redux");
+const createStore = require("devtools/client/shared/redux/create-store");
+const reducers = require("./reducers/index");
+const flags = require("devtools/shared/flags");
+
+module.exports = function () {
+  let shouldLog = false;
+  let history;
+
+  // If testing, store the action history in an array
+  // we'll later attach to the store
+  if (flags.testing) {
+    history = [];
+    shouldLog = true;
+  }
+
+  let store = createStore({
+    log: shouldLog,
+    history
+  })(combineReducers(reducers), {});
+
+  if (history) {
+    store.history = history;
+  }
+
+  return store;
+};
diff --git a/devtools/client/inspector/layout/types.js b/devtools/client/inspector/layout/types.js
new file mode 100644
index 000000000000..66735cddb6f1
--- /dev/null
+++ b/devtools/client/inspector/layout/types.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
diff --git a/devtools/client/inspector/moz.build b/devtools/client/inspector/moz.build
index c2013bd0893e..04a5d4b3cbeb 100644
--- a/devtools/client/inspector/moz.build
+++ b/devtools/client/inspector/moz.build
@@ -6,6 +6,7 @@ DIRS += [
     'components',
     'computed',
     'fonts',
+    'layout',
     'markup',
     'rules',
     'shared'
diff --git a/devtools/client/locales/en-US/inspector.properties b/devtools/client/locales/en-US/inspector.properties
index be1590e1e998..0bb985e2b5a9 100644
--- a/devtools/client/locales/en-US/inspector.properties
+++ b/devtools/client/locales/en-US/inspector.properties
@@ -313,6 +313,11 @@ inspector.sidebar.ruleViewTitle=Rules
 # used in the page.
 inspector.sidebar.computedViewTitle=Computed
 
+# LOCALIZATION NOTE (inspector.sidebar.computedViewTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying layout information defined in the page.
+inspector.sidebar.layoutViewTitle=Layout
+
 # LOCALIZATION NOTE (inspector.sidebar.animationInspectorTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying animations defined in the page.
diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
index 8aab0124f944..8838a0d132f2 100644
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -65,6 +65,15 @@ pref("devtools.inspector.showAllAnonymousContent", false);
 // Enable the MDN docs tooltip
 pref("devtools.inspector.mdnDocsTooltip.enabled", true);
 
+// Enable the Font Inspector
+pref("devtools.fontinspector.enabled", true);
+
+// Enable the Layout View
+pref("devtools.layoutview.enabled", false);
+
+// By how many times eyedropper will magnify pixels
+pref("devtools.eyedropper.zoom", 6);
+
 // Enable to collapse attributes that are too long.
 pref("devtools.markup.collapseAttributes", true);
 
@@ -322,9 +331,6 @@ pref("devtools.hud.loglimit.cssparser", 1000);
 pref("devtools.hud.loglimit.exception", 1000);
 pref("devtools.hud.loglimit.console", 1000);
 
-// By how many times eyedropper will magnify pixels
-pref("devtools.eyedropper.zoom", 6);
-
 // The developer tools editor configuration:
 // - tabsize: how many spaces to use when a Tab character is displayed.
 // - expandtab: expand Tab characters to spaces.
@@ -340,9 +346,6 @@ pref("devtools.editor.detectindentation", true);
 pref("devtools.editor.enableCodeFolding", true);
 pref("devtools.editor.autocomplete", true);
 
-// Enable the Font Inspector
-pref("devtools.fontinspector.enabled", true);
-
 // Pref to store the browser version at the time of a telemetry ping for an
 // opened developer tool. This allows us to ping telemetry just once per browser
 // version for each user.

From 23aa61d9755448357ce5de471b20e58ffc7d72bc Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 3 Oct 2016 08:52:04 -0700
Subject: [PATCH 45/57] Bug 1306780 - Use the old console frontend for DAMP
 runs;r=jryans

MozReview-Commit-ID: DJBzr7Q5tee
---
 .../tests/devtools/addon/content/damp.js      |   3 +++
 .../tests/devtools/addon/devtools-signed.xpi  | Bin 16877 -> 17329 bytes
 .../talos/tests/devtools/addon/install.rdf    |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/testing/talos/talos/tests/devtools/addon/content/damp.js b/testing/talos/talos/tests/devtools/addon/content/damp.js
index 9f97eba04b3d..8f75b13d877e 100644
--- a/testing/talos/talos/tests/devtools/addon/content/damp.js
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.js
@@ -19,6 +19,9 @@ function Damp() {
   this._heapSnapshotFilePath = null;
   // HeapSnapshot instance. Set by readHeapSnapshot, used by takeCensus.
   this._snapshot = null;
+
+  // Use the old console for now: https://bugzilla.mozilla.org/show_bug.cgi?id=1306780
+  Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", false);
 }
 
 Damp.prototype = {
diff --git a/testing/talos/talos/tests/devtools/addon/devtools-signed.xpi b/testing/talos/talos/tests/devtools/addon/devtools-signed.xpi
index 1cf42d08269ace0f564c5a46e2cafb6e75295dac..ad58f873920ed21aa30a6c6ec1f3159eb34273fe 100644
GIT binary patch
delta 9671
zcmaKS1yEdFx@}{@9fG^Nd*kj9+}+)SHm;3p@Zjzm+=2xQ1h=5U9Rh@KNoM{^=H7Yl
zRCS-KuKnpgXMMF+?~@RS`UnV+iaZoF761T%1H9`Ll6ANoTRTGn0MyU`fM35VN~()8
z$tp>)I5_#(*xQ>hySkaIX?gR`J>ut0EH1c=uq(8TJrKw@m~V`AvxI%bz_i4D#HTRh
zlf=+z7-F3#r|)1)jC^w&q7s_2yQ%G3?yI!s_S^<q+ZUR8I=j2?0*&AKZ|wUEpIt#p
zyf)*lrj?Cv8iFec-$B=z1CYnCLnBGeLNz(lvr*HAW+6aNKdV6QqvPp9kZWLygeG0(
zqp?Cm!s<mlX30Q-K{i1LsIdk7J$ymB{hM%+#eA7Kn?jK8aG_*E&_@SRqBdLb>u(`H
zqQ(rrF9t+W&<Tp|fRxKWyk{E=4fMM35_%)@&TP$DJDXr^H5Dz;!&9;lqMQPXcB|;l
zNDiZWBb73nEeRI~2RNzq`KW_O7TAZ(gedcjP0o}dzIfNcU<BXUTD$1=barbC(&gLk
z0thKdUE7F=zDh_-OoS~u;l(SS2@G!P7bZgkO984j%t{~8L1#UClMr<z5Vp{TWa}jR
z5q(=Kn%WB@oL43@-Cv+<exBS5S6ic@DSB`U2mVMS7l=siA;4#Xl_}hv3y^~&6@w0_
z;m<&TrV`5#jd(sFm4L%_cV^nPT~^3iY#&j5>d#HUow3A*)qu~tHLGS;l*)ari|dm&
zbe>*)X$78w1*O>H)VPVrD_i+h(Y!`gPep@XOm55hv4qvk`PKmyIwf}1%rp|>=9T@P
zr>M~KA&YxngmQVD0p+PhqY04rTbzzWfw%v1BDZ=)Wm|S;bmO>qp9ao}(s;*?tfeCS
zJjBk)rIxoqUJ_#8h0@^9qK06|Nd7Mr=C++=PF9E6_n-j8VdJ_S7cs)H$B;t**zs=3
zmf`Vfm#$LIc#(9O#f~dvn&njPyj(Do6)i$5>8)J>x35GEDOft=ap`jH#~V{~dXx|I
zCrK5Cq4-e_*8Vk@^<@<f4L>nfTfw$bCK}kPT+U7a{2{wf2nfu+OHxJScNz1^IN_X{
z=|}_bcR)L+^gwOp*1HeizMgKLerqLuuXl;>#28AUDUPX&DU@Wfp$|&gc^+JI8Q$f<
z;d--wumFXlP}4f?eieWndFEE)nG+y5SHm#0qca>$Tp@aLLQg{PU*k0<LVLqaoPSC^
zw{y?uz|&LNQMO_qh^`7NM^wd`NT>vp_dp#^Xay2XkOQVP*27V5eewJ8DR)+1>2qCJ
z6x4nBm_{O9J7e(1;c*uiW(Du__r&p?1n*|`h^VsgvZ=ntBxM#1cH56mw$!PuVg#8E
zEHZD7rQmQiHlRNFquRk?AwfPnFu#|M?Q^4HBJQGHiV@Uty$Net)yi_AXFhiaNC=94
zXk`Q8E~v_Tln>Tl%*Pt?-o>(_zmHgKTO^Go;)^M%h{nqe(KpLgSXptAX%wb~S*7q7
zKm?-}y7+R*dFvM4wZY1p+}1M_7BWZ*EOu?`%j)uSA-}KPR;)D74ZK2Oazt@3%G`(Z
zw9MA-F4nG6uccWPn}9)yfnxLBpS_kncH#q>UziOfH3)`&8!NnbJy|1%^!Iw&*5h<A
zqUoaGim<9V@RG1CR4!{baSk5OWT*Vx&IfbKAlTd()WO`1zPj>FMiL#<u02q|s%Fjz
zvL0`hD+~`D4i{TbNm<`gFtn#s@%El07tj%lGL!ZVM|Z_7UQW&5J=%YA^o`D<RIfTn
zu`OaA>|UPnL4*^NL_Y&^NuuH=@=`7Tv>Dln({KbQjMNc+r)1Izf1Nx`QT%iH(x8zv
zx?^~Z?S#J1(d8Fz>1RL8FO%s*eGK0FWE#!3aFur60u2?&Z;lV$N&6;)iBI}ICmh~7
z3M`v+R?dX?X9cwvY<{}-_3mrz9Ga&B)w4^$=#(83UcLE}5)vbY`_5i&!WPoD>TMj>
zn8W4Uij{&zKI@f^a879DeZ1UQM`tH%!FOfZngvZ_)8+H#n953AiQ*29LXTs)_vVv@
zpFPCU=v=e(D?hPWB_>{?b*YUi5`BY5``Q6O=YGuTea}cbGG);3JhJ}vS>y6&GH3~n
z5E{6CmQX_#K<)y@`AKjv2ElIaZG*>Wv*c9d3vKZX|Ll}D4l+G&F?=^8-D!XJ4LXax
zJ$n>!uYR?=Rk^x^skOu6=tT0G+tr<Ct+SI#FPJd5qLQx1RNH5?jLunT{5&8_dn2K@
z7HL~H3!m@GH$!1p0L>?<bL76o7L;(wtO58ic9XKGC5L0^jKdv-Yhuk*r!73WKWJ~n
ziuIO)jYYx<`yMR6!A`K0`bB>$sOMP~4|^`B?e&Hqsy-fB0H|-ZmkDOy9{cpCN~KL7
zGJV$3v(!VHy5M7u3alXWR4vJc<&FpXTy0Y67Vo%H=kj894tVJ>gLnTy4|GJ=TvA(m
z^HG6fu&YCBN2JTtDv9MNKQx~n%aY+6Q|lBew76|=%iMz4ZL9-i9I8Zjd=kFzO%csN
z$rM)wu>g0&lvi`C*S8E=!v3V^Ws(~!*rz?W*91hnJu;My5uYPR!?Fw3NlBqcu}kf^
zx8W$9WY?i;==K|#1)^EPXh0lc2-nKYDMvL$Y?KQ0r`HjsQVa&n9Zq@%kG{!<nR9X7
zQSse=#vPxF>twA?nNyF-+-3cWreLI(Of8%k)?$j44{Y4o!^3e^@h_&3-fQejz9HT>
zK>cpL&UeUiJPhPr@YlFstA)3WCyD1y1s;6Uyq2C0iY-XKLmY(ka{y(A${TVBZ=d)R
zr3oEHVpPir<gltYNjDkU%}iP)!s|S{lL{csE{ny&Pv<A!H>dM^P?D;&75hP;R{_xa
zTmb_nYUJpw^Z<lcBmf2J$oq4|R|14)yuB`=Veza`BCw_CAtB{uW$&k*3d7BVU3wRv
z`U#gtId=3KQM)!%a6vmZOiDj_NuymUaY7|`Ayk(Vk5LJ59Da<ge+`zX96v?4RLveb
z15U<A(|0}ymq3%_B8~Lguq0mh7C9iZB2o8~?VRrKSJP76oXyhif)ib--^%%P_&mif
zc31aAe@#12yim4Y%8xuPl8QNKf`3Zp?(raO1^e~(`CV;BUx97`JrSMxOP|oxrLmJe
z(!BU64?^%QU|f5bDt#2MzS<p_=6V?N4Y`S`RF92uSXhQ=3}EEU_LO}MYl`zN@6O6I
z;TtF#`%<VnvD8f)fa+PLLz?Dc)g-OMIKbO>>jHE9@o7EFu1IjIj#`y+gJe(20Rm{X
zUMF%PN-o7mJp$VLs#B=3qF>HX3^A+GV^pT5FhXqm2xCQ#&YNza17JaO<EDNsB)~0&
z6jw5P!?{j%fkj=9f$V$Ez{FzFFnnPo<tDl8q@|n`6NY)`iKo4jqR?!2O~}Jft~)5y
z%VC)h$s>CoFO$Q6qv7hsXClzU-)6{6z#-hsY19YUumYLebSE}{t)UW1YbqN>dxFt_
z*n$5pYPlBGI1B8&;!w<M7f!4eIPu-K`)0)YM4p}GvMfDt0BKdLgFPb1rXHP&F<3YD
zFx)h_B`8PFw{KDv!8*ZDQxU{tHd_&?PdkappMZR>c$lJGv8QF&bI{}nT=OujE>+ta
z?ZWt}*92;5u8!_fOD%1+z8dbA&1|2B2|HPP$6Jvu2chK#z4AjtTVpuSDV}-1Au8gz
zo77}<VcKS+etiuubhlr}{!Uu?`_&FHtW2^8{kbV_$Li5J4HJgE4nf?ebbL$-h7*Bc
z-E~lWew515z~j)5^J$2JS3ix?MvWpC<Hwn%h<QP`1L#;!S7fl~KND2mzkBxF1q2Hh
zv0jsT)$yba3NiRh3#?mM%*QvIUb}I|JgyuDqmz-I#C0c=RA@17GFc*-PAs8E7b6;N
z)I`0ab5GFK-660D!4r(h|B&=$#4|f&-(ao9PF^|r_1(H2+RbsJ)R;Zku;<f`rHgH6
z_F*3AO;@!5#kl*q3x8>+1Wj&zIcQDOKqxK);5}5Xt7e@(=75`kYnUXg=y!mZu0S#T
zkxL86r3}YL6o<KH-hwnIYk@a(rQz}I7;>1(5LnoIdXWAl#0wktTN<Rw11lx0M+G{n
zl_^}z!s9gAg|R`8`@*(Zst)ae`S9f_Ce0y;dtKqsW4d{K3SNJu>8pHQ>qu)AoJeiU
zC?Qr`=(1xM>xh1qxlamWsk7=0>F9Rn7R<_tD9>T41|(qH!&i&>oXxnz`pt2S+m%xu
zq$!5vHc~y-em-ePL%OHv+Y%jhP@0|DM_;Dw@dyR~-LY15b_9kry4N@=`wFrs*Zatz
zB?IAO1HTQqlO0I&n8<|#<5xu17G@ogmQ&%6yw?UPf|BiT<0_BK2Z<aTFi5@vRx*T@
zhqL$IETgMuINF4=5Gd6m``bAiq&yc7zd875{;`rtxW)(UN^8nIcbU2eO_kgLzpQV0
zpY#)03F8iU>T(&zB3IM<ZvVAvVWfK&6z7>S`B66NL`UiJXCPO)c*4ZUX4^j9n>CdH
zM}#z(P(iltJ?_|*83V`e;Q>Y~TW_n!)}f3?{4x;W4|U=R6_T|DL^?FQP$p<x0016<
z3t*N|Gg5PRa<$M<hXFw8-kxfCyhQ{+K;J;Ttog;QPBH{g`a!H{5>~N@@|?_cYt8^i
zW64qYHUNxP{@o1OGI|5n8x^Wx@1z^eXpjw|GGOt%%_tCwv@e!JC~5I^XbtxySty!V
zq`z5>`>H2_SR@g99%@*PyBk3sEWf82yTLa(p4NJ!e2ScJ3OFA=PfUo9;|hTp2r#4B
z!nEHXY1J|gZUCK~ckdsCO}L&B$pUa=wmk^XQJ}|BYCVq*!*Aq8&hx@b9qr#UtgU{4
zgR93@{!=nsxS(|M69y%s2nC|%zbi{-#8iSucqt74C=e7%?#3V{bN2Z^b^k9Pij*9G
z`)G`zB!`2Bbbc+H%!y2mIA_)IPv06XkX2wn|Kh4XAwsgy7$d4XC;$MZ004mc(r_~;
zM|TTHcNTLK2WMtmx8H65e*J&K?-JO#ZMR%>fM5y^c1Cndjx96IcX-Q{_wCk}y?9z2
zFTc8Oi;+`aD4^4e$d&RxoUILo0O+FASVk?DA3{Jwu%7j228_KBc`R=~Ht0)9<`%Kb
zZ5r-~O0$k4vROVEvRIC1U#Z`Iw1K4X#T4DQ9~$y^dI)BU_)h;ox}S4?ZCnTYq1?EO
z?**Pl*O@TK%|FR~4`G`!S0X-6A#n8+84=Q!C*K7lyuPd9jeV!`wqwTxstwte-Qxb9
zS2+!2FCz_2P5PP><Jd@&Tzfk4!k?v-Vo7b*qoQ{~e~-r=X$OeoNA>PI+o)-`t!VQb
zsKb$Pjy`KYc^Z3GOuxzXts^PISPH?4aP{@=<B%;j?`;_)>Q@8Nv4Qban1My=qhfVY
z;J~jCGS|qf&_wvdz!+ERE83DPN%em34;@{g&Hy(Lm%H0Ngap39h@x3>kps@+x*Gt!
zbfxYz9U5&=P>N)uU#=%3C}bh<!qr)*^X*J9x6u#2qu3<QIMaE(YR$y1S6>_BUvKvn
zjfmU>DOdu7NGVZ`jk<`v#jo&2`9`h4JNDhA$&?o6TxP-LRvc0|5|-{{R=@=oOj$~h
zK?5&j;;wnqeB}AehVgkdk$huD{)2Jo!;O&?AbAP{Z*8Kplm()rU>|HQnVD-lh+PCf
z5@u;;xxe1ON)={qJDI)S2r+I>wq{R7;rU8%NU!|eu8o4qHDOz}vnYG_VX{sx3uVS^
zS;kKRSvCBL_Mf|^2uj0RUgy;K%E=_4r0>T&mD{yF_qVvy^PglJe(=#6WvSU5<STO+
zrPP0!k)X|rjMtWuri<y*rQu9P0^7Se2S!8L1NZNJ`U1mXDM`TaKiZY60z$-!bUUC!
zlX1u?0y8@yo@FT!A>9+)M?aijLJ{nf@jb4CsVQOJ1wTUBGBKZTSleb3@yeKhfCEdJ
zu-0;OKT3)F69Zyd-LZ;gJ*P~eOe10m!(*tv4{DH$A}K)UU=`rW_2IKjoy(%7Q3@FM
z?fH#ne&y0m-zhMra-k)miUGhe<T=t8avyrlO3KEoF)!t#L0XnYuO@AWn&J|Y!h!uA
zOf8J3@rRn^mnIl-lb&BeN)8l(Xw94vAnNg?k(2pCVOX)zz6ZmzZnwK;*xTLGybGJ%
zdR@+CLGPo@&n9*0d!!u`!E&1x=Y$&vslpt1OQ1@`HP!>Yc3j7l$24)#GI0SjUN?<<
z5wCPZ+4~KG&|Uw>x9@xT{)<z0eWyQ&LM;uE>5Pl=z!8U|^8AzS+R~(~pus)DkB!}I
zIFBP*q9Ti&B@v-%U$BIDj$dVBCE%_`(7#DfI|`CUYvrIq4J;?9)|}6EPhHIUjJ#aq
zySXHSeWF^3RkiK~oy;`x>RCfq9mrWeV>S7$9^c1Lrn=9VVe5zK?vw3@igfPW?l=6V
z2WMqXpU(vkpcD#^U48^xB7rC(g48r>Cas;$V{6y=26gKLqNw1<h>WBUpW`!X=iIha
zi*JCLuE1<ng9_0yCX+XsL6gL~c9MvjG^Dfz%V5dv5L%<6x)xn5*S)X@aKTsF3Db97
zlGejRAykTpxG{}*g$<f>XyZr4wpn<B<dfC5EiT1aU#yTk$7j_1DnZA(lv?R}{<m)&
z1&UhAm!pwUxp91xIyq#|yc5@rE)F<HOT?YGgjC0Y^b1S8bq!BuR3#`zs8hA4H7t%!
zQ_nswi1xXJdGmf=Ijq{RXoXyYV2;41=xsv=L*hlDna7!y=RNhku@&Nk-$Gn^6+OgQ
z)?ib2PD$5hD+uhKt3eQSwA!1i)_7vEobwDhDPu_i?1f2S+;Ndhv$V~zn(Ww;gJxnX
zr%&?w0^X^Gs_|#l7CENpI!F*H>6S_dT3&5)2q_})d7N>il<yLZQNnS>yNyY%f((Ju
zvfN5BxGG-G21@+KZ#A$ZG&l#7jW`*$%4Eoef~fGAdyYTlID&FqYdJYFo)W3s$q9>X
zupy7E`%Fc(QfC$?0pk2qNqmy^orBy-sd_M1d-(wtAcC^VTS}kpB?#^aII4<7$sKLV
z7{dASO`&tv5<V&?C+4UfRwBGv@L+b4A3YN%qw;>Vk-d&Y-Qez+Z9N%jG^04DtdxS0
z_=?JxpA?L4*r3N&TgN$FrN=eE&Bq2dYaBS*4#OampLsRsH_h-2@B<Zkh=V`i=x)<7
zMZZ9%)H9Wn!sA|E(Ead}{&}v#m5B@#0#@n8S$v|0q(;bnza)6nf1X@JR3~5Th<C2+
zfo__D6jG;FgHV<KoCrSa!=_%=@CdZSC=EsPiJO@m=>uJmoaSYEe7AAF7G&=apnGpd
z#U1<>dFLb<4)_`Cr<`n5R~EvJMH4YQeSY1TLJM3+$pDlNq=NolLb7^7J+WO^sk~Bx
zF!`iWunDRaKdzW}nK}R_Fi;gAdp`9`J!KT0B+G~uXDxInx_D^<oe>@A4USCiNAu$_
zXj$mf>rPNcQnIlB&4iW_h(O9PsY65Jd5iN7l(_%1bSq2O^g=9kWB4Zg)pvv%{ms<k
z(&8M|t>J{`94%DT8&2dPXDuY~eOtyhOc8f|w?+;r%7vHbXZR;*MU*KdRJ5aj2fCwd
z?gBf6a)c^9y!C4<m1Ds=%BKUgnaJTIWk4ei4jpL4$+W6=GA#cH@PivHbPk;)=<O2l
zv<G|hj5tDI(ny&VgPdT;#ekmHpV?KRr*Xzq`mriF$J4@$3k6BGmdsak+BE4y^<EiR
zbh0B{Lz+@#)Wz5mnS?GpvSs7xvvn!~kuPz%p55fCz7g#*l%|bVTR2(F^fpn{4Zi)e
zemTfZL%fAk;fea)=aYASTU$*g9{7AkRJ9bFC&X4~kBaNfrg;dYpf2Ne_N@3i8m33=
z7s7ax1;J=#K77Y;Oxf!kgGml=?a=h<<Kvi|!rK|1whH%rLgOJ!<D7T=jQPNk*NV_I
zo9g6+Hn9UVYOB1Ja{PI|nhdoY0h42y*4rR~2Np&ZgQ@<d!*$6+;uD0~#DT-XIp>BC
zCJR)>$*DkZuFu}D%^-Z|^}my$mM9w9<O>-WFH^;98J7$=Ha9XcGEx1g4GpbB-y@sO
zN{pkAUPBl@bvl4oKmtp_5Bdy}Jbbv?{<00`uG8MG!g$W@PlL4Iw!?vS^gUh3-!K9B
zV%*>#tBs@&$>dO~2#om%X&Lkw<~O!5^Pbnbuzfv)ULn)dB;wt_vVCB-(SFU#=n=(3
zu>`ro-7E;<Wv)mB`vG>3eRN0cOJAOv^==U@hu0NWVzWrITosI?aL|ywy2AUphwRG-
z(vvD$*0WPO3_B=0Y#oBl0QTg2ehVCs%jLTX1;z2XCR(27Te@JoFuPQJhMj<dtHY2f
zI({cztQ^oI)=YDMb94>1tMH5kW8T%V8$nJMHq8E-proUNakZ%()atC(0mec5((?C5
z;MQzMH7&o}4OaaLq$;Pw$=cy%v&->3wfVTVQ~4sWLc^q*@=P=B!9#EmBDV{KHKgt3
zN_DH|yZ|;8E{XR~lVyh~d5z@T_4aMAP@_jmrTv$y%ew4t4<e-)T@N4QxsJPsoL2Go
zE3rbZR+PJ}?|Imv?`!0UfEA9W#<gcL_}yNkzL!^1J2965k57-bm}rk;vYM<kyAz_`
zI$vdRDylQ&1qt6q9@CMKr0XeyQh(MB#CBfA$4;D9n??KHgj1?LF&pljmSxv!>fbHp
z<Sk2iI>udwQQgm@knHzXTd(#F9BTTNWLCRHp1SzYZkvt{;!9bmK{EGiN#q<BL*CKs
zp)HS)o0!#YAYIbOjISvasc?0^>m^c@*V3YRQjuvo9?~T`H&A&;LF+jQide+frMd@S
zn>)P?;5hzjD!~+}1%Iw<&Xz@q7lS@a<mvr|ZtT#k@#8@VPnj>%nvi#$W#KxS!&iUT
z;Pf^sS69C(AB=7wv+(U`eP01FZxgVCYd&o4Z5^g%gwHwhe#3NF%TB<3qTgAz{uEX*
zW7ZzWKL5kbZRZW9!pBe`2w5-X44+yE=tmN3lX<9-<APD`$DfN1CHJW%CEBD-*z^uc
zvk_WqB2^9o@xuA25mNT20*1X0eX5ImCk>uF5pi!5P-ALf8Qr#4%;@1&CldzlH|Klt
zSeLi;4YD}4twmqN-L<H9)#6bj@4J(3N)cz8g^prN&7EOUfLr4%pwSwyHh=VGZ1-_o
zu5_{)a7@g7Kk)XT1G2}uq~0}naZ}xwQD=A<BA{O~Ah(2PzP3dHUk%P@o*}yZQ`Edr
zPdQwdA50>ea=vG#tEQyhBur?(kvF_-Z>F%=aFl*ol(V$8f<{%WItvAO&t3K7NMJas
z6r?D*(Tvu4;17{FkdjQ^H0?f1ay%o7QvbQTnqywu2Y{?FP~4S#Md+Zikiyo7X>it6
zHC|S&v{B+v5l<THyaY9*D$>@gU(KeIF{o{<o+lI`5G`s$TLo^%qJq()X11vKW2GVR
zpo7h4%V*tvKCUGY2|&_Y%EhtM@5mDZv(lBbDnM{>J$KCwI*(Gt@Spd8?MY_s15TN8
zAg^-dxbfk%AV=jiNOLwT2M%<X#e8gYd%t1)y`6JnCnw@Gwh@}>6Q36kPODRGc&itv
z$N%XNNiqm0@pOzP*+YeEdU>X$VpzTLq|itrqiHW{O^PqC>!fM32N|mwaTN}J86H(x
zV<<B?G}2oelw7%9u1438LWtlF_!=NFd}pA>p;@d`3_GQrCNQUGh%AYj+l#fCzhyX{
zM`+T~sU~o8s;pPQ*Sy=B$D*)gkGKbAmhxQ|D|h)qC`QeY=e^2MTYht<)-c$`D{|B;
zr{}xT=`>80ly+uj{9N1~qY`b^jgm6|*+q8HeE<zEh*FiB<;Hu>j-$j8<GaN?up;}4
z3)W8n&wyGj^dM{CXAVLgTe@^loA=zSlc&&l#3r2^9kr5E^~2$_VJUTNclS|DZCO#G
zjAV4;?P*BI`ND?0@M?_}HfGHFcC8+6A3GlcPvK5C>P3Y&8{MgT%gPcOk8(9JzH)&q
z5VWtoRQq+IueC@MAH+^?DC@Fn*1bO~$#h5fZSfsCR%9v{`j9#HEHS|P3z__^4iUpf
z0C%NQWg~oR&=c}v(_BD>%?f$`OSgdkMdIrjnGi+)kod*}MkXluf6?r-Am-!{Oh!a9
z{)~S(e&YwsR)~L-d~<<?WD-_NvW^S8e@Oa2;>I76|2u{`EA!tml5<$Ypnod})NHi>
z!TxpFpkP_RFLH_mUyMWDi#L2I008lY-P<_2xtrMAGrO8w{$}=fe*~4}7~XqObxap&
zZj4@uU0p<top)c=fRma|3m+Lu4x^y>g@~E%+BSIslGD09eRek8CaWczJZXD833ty=
z&N_8O=AOx$fu$)(UA3hf7?2?PGi0)K1N#B*vyB!0GtIE+iSRZH4&M3=S0)ZR>9r2o
z+BlZ1=U1-Az$!7x!qmVEDLHCw{x`HXqPlnR_zb%H`TE}YL6#}*RpBh9@%JZ#pUOzI
zgqVE1txHq~TG=qLxHhg_d3;@T(q%h6w(;<$gzo~N{xs~@|M1OwxQe!r0DuZivOYf{
zNZM_S6$|!UATL+|6B5_#lLAVA>{hS~MfWl7X&ZSv=mA-;f#ZUB(^6LX>iJ-z5xQ~Y
z&iUTd2Tt0%1#hafaYiP*ycJIxkJ%(iA@L}Fk+v;8h;l?#J)CYGOqE7xC%{VLAJF+j
zXanrhy1X5I?9hEYtA&kF)v%e>+B(w(x~!yk+zD;x7g3&ipTaC@x=|lS{UDFn^Q7n{
zmQuRT`9$HTts=^AF2=2~*ka_(3DkscCWJ%rsLDo-IJd8te-1gGGG556lb&RH#!%2X
ziO}2|@#WQHRVc_fmK3`@j7C#>HT#YKd#<8;GCX&0eFQkuaLA#j%*tiLrla>BboT&c
z=&JGytI4ur*%e%q?zvq(z!pZ*oz+LB<>1v=R@8=2uYX{I?+($`tGCfW@TooPzh^${
zN3v|UtLs<-?DRKfgj-|+?cw|liVkW%XQEZn%m`7LGHdn_SgUMhc8CP{hP~Eb=#A`v
zU##K6d)_#gz#&{`BX!bIRAuu8$?S13ExZfb++0B_cF5Un=+I7h#hcxnLwBKt^1~=$
zfmqI%$DwjKYbF&1CZ&CoxQu@4IK*%06;Fmzy7;ZHU2V}ycYU?wyHo_dQR2N3vLWd_
z`Q!XD+Ps5Nuyya3eQWdYkQ0;Y8loMxtQDh)c_4|)`DP*uIu_{ip?z@~(Cd%<#3D+x
zcZGxEQ?!$}p8lT+G;%AWj4?3Uc0~wiDOD#w-RxTP1&#FHopPZwt53MPen!HA`O$e5
zUDzbkxxc5*yv~IT?PB|;K<bjGSP<jHSkBnz^H?T1lEH&<WzkU4`mTw{>Dpt@CFXxV
zh^G1Vw6@8;Kv`|SPB9?SMD)bO<r5QB0r}d^8iyKq*1@4YSdb8zEj2>-ZRXyiwz~Jj
zu5P&WuJ1h-wFZAlddfX?`iiRy#0%&^Kw?4t3s(N)q)D=gAeX>@6HtHah%aA7L1f5)
z|F@i)oG6U-FDwxj!so|$5d_VwU7Z{(m>o<UZ7eO^+<(KxUn=Dvh=PD5hWaB{o(mEX
zzWZhVZyoWs-Cz3UuRx@~Kuc}E(;E%$MRa_rhWG`VeqAq4UlLtFNj4Ft`Ww)GXZKsp
z%oN0@62ST6{<lnN?e1XzJI-G^=Pwh{|0Zz$iSv>0fBE^pa_28EWWTWY^V<d>*$aq%
zeFb>Q_3v!Y7y!w=jKu!|%)e@UL46r(X#(lWm!kAvEMNbJl_5)Voe+`HUnAkaHS}dP
z$o$Ipp9|&RJ^%nTz=@~^+n@ZMO{^^3SbjI*uQ~F&Z@))}o(MkVJGNvm5z_yi=)ZRT
zg9tv29{V4EDy~kJHue^-|46`p?ffsNp#L^per5Tu9Zcl|{QpMH-=+TjH2=Ztf1R89
zr|dw8@E3LZ&nYSs$K*IsEcstA!0$KfWu5oS2lJoxFZVzQa-qLX{(bPu%~C}k=4A_i
RY2B!Rb!Y&f>tz`L@ISljPXPb`

delta 9204
zcma)C1ymi&mc6*UyXOXn0Kwhe-7Po-cP{P{xVR>GaQEO4Bsg3k5ZpbuGs%B{=Dk1b
z&HP`zy4LDGRr{Q(t~#~$=~Ej4bsPc(Qjv#&#RUKWhycZ4SlKU=&wxu*06+s10Qmh@
zQBp&cSyoAk)xpWf#@^nP#l_Y1N1Bxe*arWrEY&4(Av~%f;x?K;>}RzUYQ&HN8P-H>
z#4pHLFx1n@D@7rkq9TQ_6~kWzPy1R!zoE=`!*{cCvl2ck5%e7o@O?RDRtE7-JpFKm
z68HiYE0+FI@>ULp8pdjUUlSnk1jmLLS`7W#r0}&KVtP(8?8p0c*pXiKF6gsDMF4qH
z9voCiw+Z1;zl6&q(Z{<{6bW~1-05d#q<%u=kdU~zNyNY>4VB*YHXY$uFqlpaEyi_V
zgGrE0hoFIn(#N(a80FDMa|$#kO}tj~HWyNYE<+Rh1!Zu6+{Pm2qE}}re=6|S1^^o{
ze#Ht@y*X9NhoqXNzJ04h;K{ywy4YXC<J*8s`EwqhUgX>3$*Ov5jG5sN)zzo2uZ%B5
zmT~UzEjredZvsgv!%|a|Q<87v!la=6sp($mp@cbcx^MkYHQ;&lfw3Tt!2#^uhw2C`
z_;e*WqHHOG!~G4@C}+`36Z<byZoua2V>J_oRmclRG%324x@aC8PghQ2)Z)ktd0Z+y
z?d0@`a1LU3h<8Az2PQodEJiU6@0~KzV2CK~6=6}%y(SEzsd|0_nS}qVj>^pEL*NZ*
z5Hy3FP^xLua;V1f3O6YG{mN{d&ew9H_t&!S6L-sATo9u#XHQTPc>3^2V=bl9u9{Iv
zvBa~>khzlKH`ckatDy2;^UHE><xh^Gt2hh%efzFZNHSuvGt_?XC+=iQE9gYseHUt^
z=z{mZNsUa~e%~v|PM#;4gQ?woa5{Lk<E&9zKUL`=FUTzx7KaUL;f$iA+aw{0A;)`*
zlCl-=>ckv?;NAhGJnW6B&+h^G1wK?E1jZ88Tk@`eejc?bP`tyAELWh}xRhc=T;)_l
zT$!+Q&z6Ylmqa#DQrTNR`PAeyIHY{g?e+2jW!%ihUvkL%%3D*8rs=|KEM)ITrZ5?Y
zG2QZ42P3WeY%ggLqm^oBvf%5-mC9NDy@$l=axKg!+YZA+NEmunin^Rz>1`M>J_n+C
z9rQ&0@tS~D>)YX<qcJFIW@ZdbMo8(&k=Qmpkt7d`bdc+bud;qx#DoQLvBp0Fu&S(G
zF$K3$tF2|iIi59UobZ6((R?4g-fvomTVL>`4nRcJuDi29^ADAnkK%xNL-UtS>Qv>Y
z35A(0nmWf#7aiH=2%?^CV%}Np=qLuO-O{qSu)}IMdGq<ojqLmET~0mh`d0d2;&4&|
z<9B0PUob`|$x$IYG+te$hB-8pP3`wxLIbfORFv40tH?Mm_iP*AVlDL&z%FmJ4yPm3
zQGU?g;L#$3d|1P(;?QTqC{)h9p2IJ%Jihn=+vC3GCs{uahq$_L(S#;GZo)g@<l$Nv
zd)GAveVrL^O15a)KgNET)q721EG>3q&Q8+2kdeMPyG7&JXp1FZ&y=%E)u-XoVaSkG
zeO_VM5uQOMmd`mC694IIn8SxK548C^>4qmYC#K}Lph!a_J_-#aI5?!*)=b3y*C*^f
z9(Tbh@L8gzzL!hynn%l$-paoH)RI-Y(7tElNKaNBmKHY~6&u7|42$LP{ak*qp&!$o
zobHo#^J`0Gsa6!m$|^e$?V>!a%$2p${J{qqPbD{NO%1v!E0*$p&YtVjCGC$2o?o(u
zw6PHqu|Nl|7EnLZk~IBS5@+J~uKSa9RV0~{Kg!xwVEY4YzH8$37FSd3BcNm_C}D2I
zOO%1BoRFi;pyi6q#;VEbuvZ_YT04(QhFqyA57UO>%t~9|2DwaFQdjo4jjJj}yPVGr
zHH6~qlxkyhH<m*<@{QBO6<AHql5FXeDHz~!`ao32;-eQf`U0k+Q-z}RCJ3uxJF*Xp
zIXM>mP;Cegyjl`ro}E7eD&>B>kE!`gG|0eTc{1r*3+qfc(Kal_7^S4%d54x#$o2Hv
ztX`$sW!!pHF<#-j3{X?<0cmLN;!E=i+2+h(lOe6wJ*(rzfewt<f>2-tb{7t*m@@S9
zT?$AgZ;k(~OYT&77~X2ow3Zy$f&Ub>kvhKMG@Bw6R8bLH*bq9)eUK~n88q^eb#k7E
zxH3({s~2LDU9{z(U|K(}{}$QY6GYpPQ3J8ft8&Mjo#|d)Bs9O#EQ@sYy7#^U>$eTy
z`^2rte{S1mE?uF@eVE;xGS=WoMQ2jS#Rm0g!0JNfq?XVkKNK46$>~$gs;=8HoeH@@
z3yD3w**(DLPQ%O59sh6>QpzM;sW^__BtN*HU9FxKO<KE6f%`!yM>X$+OAtN<E-IOo
z#IOmpXXb#tr{Z4gyhu)+vVW&Ut<;fAKlM_KpEWauP+_`~3OMgfSK*P5T3ebhjs&TD
zb~PzlFDZ56syPY}PZGCd({6lkWl@|CNs4Kl5jhvdMcG%NbiM{@oZV}NR3(PplO1IF
zINu<!hDIiQsXUZ>d)$cj`D<((sml*XQPf)E(7w2d@DqqJ;ib-qjtyJd56n2rbD*^B
z15%>@V2}5OoMl;8=%&;Pj=_Ti#Q~`BdqzwJ{NVKcMMs8SKz?hk2pPM3z^S6iBbj%5
z(z%^-o&&cnUF50ZoA>Rshd&scu-Giep7q$VGibxnJlY*uG(WD{=6e_1;^DPQoljz-
zsa+XGuoS9EubDb%70x3RT&pSvV6^qzjV~eB-_W4i*-4Yc9DL`S@a?4+_3;FmVYsRo
zofOACO2W92Mdk(t(&qE3wQ!2QGJE|3aJv4iE0|?8?R2<VJIi*tp}j?j!OM4Dac|om
z{+bY)BXz7NBmnA+(kAeJOVy?KQy~BrmJi-q8Slq10j`hQAY0&_#zmg3Z6LN(d~lGA
z>@ejAr=mew6wB~8-mvK$+hg0H0j%<D(=bn7OP0E9Gz2kZ<>QXY4@{J_g6W^jOb2EQ
zEFc5Yw>GlGtlFO%Wy~BrWMoc`U)ZtFC^0FK3Th~=gAn=4C|_#?W=!<-^<8ze+;(Xf
zv@{mAaE;4;n}ggrnLI$A<s!0Rqz8rbi~NH53P`HPX%!6ktoRlO9Y_s8JqiS_exp7m
zFBJt$)$7Zc65_*euAt4vSbbDm-;?=$n=ZgD)8e93?XC^`AXI$})2gHOO52P_hnMNQ
zkgF8YsAuAmu8oIHyivSXRHghCz5HSHkojvn9A(1373(x;2Hn*gT?hJ0QE%mMz}_Hr
zkped0d{v@R3_-*)zYih=BrU?)7g%qSUfS%<tp2D~JFl>PeYLwwGaaEf-a;7ZGf|SZ
z-R+_RxxZaThp=~?lF2CopZuYv9XVl)no-(UmVp^U@jnR1aIO6>-59C^g%3>fGL7_}
zqkS4v?{=F$zMG|H@<#8)5g)3eYOtHtmMf_hxj9*FXk;Yfz}7PaF%*T9O;2(Q$~+yt
zSG8dBk&L?^hc9iZLf1$<H#qA>MKH6e`iXI!;N8`fb+uexd{8Xd_rj(-s5p1PC!b(S
z7bTwD#UuU+<LXu4N$lRpX76oBY#Ez$z&SJi7K+3<0r;`Q01N%)*)7mcZgV(U%|q8B
zb}se#n;qG9mB&;Y=&PjF=Ibg!U++$<HiaEV$!i@-QD&UF$I<a;10I{aj`?HM6?|n$
z_@bYyo>KE~h$Nw#(<I|sjT*8V9o(B9Oco5PPC8mS)`t^^(J+g18GDgGDon!!xsT<S
zf6f~d<!Zb;S53HNi2Y$gV=b^X4~81tvzUewyMHmx95x0ofD)#dM^R0l5)p%+y^~-t
zg_#Pi+q&X-0jC&@xc<H9)lyxG-0Q1e`+~xWu<@@`iwY@KKz4>I0_maiu&3>E1B?pp
z$MDZ0Hf(ZtgWt}vG|`C-c3P=|8KuK2Y&zL6Rw9j)=kXYobm=n2iA7q*@4uGk&^y{K
z)2!r7#h*+&f~L6K0`ZL8)2LI|o9!IX`<zAT+x^P}(reCwD(|ivgGQ+<ZyhI?g?4^0
zzjGl%J(b(g;3+?A^S-GbipKONlP4K`^_&KOC&A&TvxRAA?|1CD(yy1*ZKWU<+0oG@
z?ZJ8O-`JjH_|=pJXPq>U*~fD<h6>m|L{TBM%6C9r1F{zNBwUed^Q7mN%6#&K++0ce
zR>gBgC@FWO+$8O8U0m<d%E=Ck71Ze4FfbidlWfDPU!kV$_rcNI)R@n11&(aD`ztV@
zQa*I5c`(6Zx2yY^N4!6|k1bCBc>b2dva@;|2IZqj?W5zvPnT*HQaJvW?<R#!rdiok
z)jZ!Ook8H*5o^gTT*=QVK_54#nt`-~$GdD1wRA#YXTzq<&BKI_W$-IesF$P&mIX_4
z%_?zwZXj-y4eL-sGSBHN?fd9GL1`cmS%_!LOt~Y6UfqUIk0)-OZ_kT^jSlBKrW2$q
z8}b~}hZ_H_EU-@!e40B;a03YOo|PUh8qWFIqBMVM$na%rKKpP$5H>HxA5t_t;_Ui7
zS5wVRpF4ei&{Q)hl|+H=muGx8-Iwpuv*;JCUp#93Ugy?obe*zS81N^5dgJ#f1C}Lt
zg+gJUsqOBC0)T?OuJ<8OfkQ(6#iRfLhW9YwVsvsUkZ}Hgi=hC3e~_;~LA0FcWWbc@
zv?#8Wv0DEG0V|^`A^pM8eu=?$tW1BE*5|V}L*f1*{-r|JZh0ap4jlmS<pZyf5`+Fm
z+qS*~c&Q2NIiL%A-Oa2HsNVVR{!JUtzNApI<Ej0GY_8vX0d!h1Y=7KO(1jLP`7bMm
z9hj7oKi!lz6!bx7va}wxUe|ai)<bEGx%C|%oOKH`V%2Y1qS-JN&eaqaKdve-w5<t%
zpKMZlhd|E?lXOe(otN^2%@5f-qlJeoF>~@z6HK@XD!R60GuRg?*lU$aD)NOh&JFOl
z#+6!Wl$8;A!|mt_4ODuPp7BbMaH5?OmX8CQO%-=4TGH|NGvoF{yJ7p227{l<72r@{
zGM2AV_!9lO3{`-gJ9RCl>X^IyJ={rAr!xZUSs-*R60VQK_8pk9uW0zp`@+`bui=fG
z&#lS!Wx0ya@vSIQZ`R{z{1s3m(6YMuAPNAm935lNyEox*7*JF5XLP96NoN8q=}a4;
zEZWYJyZerp8~0ap+Yj8_+TGvSh3G^nkcwuKHy{XQ(3Q55yObY8;VhVpa7USH4oNzp
z<3X(91e>E)WcD$06c^95V@W)wPh;<JmL>o~57xZ7-$qE2CtS}_@iC>g(2vSjfz>v(
zlyJa-;KX2NZHv@*vG({1Y*+R@d(lJLRa?OX_m&J%g?6d^0A0~n`eTR`Ph{{3M>?56
z*f|86S>qQ=RL%kFl%Ee_H<!Hcwa*3Uyg?b3yP3{$HpnfLej`WAzS+Ko$qHk-llpHh
zTA7NnD)l0BOg&wKy#mL*dt#2Gd$QVb2r>Aexrs1Q^mU>YLZnQ_^Kp5H7sET?>lNrw
z#2eb}$9&GtVY2YCyzk?P6lLJ^gSDaTnBiI^1-ON9<x_jS!s{C`CX-6<CIrKAo<PJl
zd$i-zkEwLw{peXd=xKIrjpZ7_1MFDvM6gKj!$w|t#VhxgVlQH$G;P^Il&Xh)3Nh)*
zL&g1Y@u?8C1b@s)9nY>BVkG9iGpIAAhyA7!u^hcA!j3{pjTGx|DW+n*Ks?}9aP$rz
zbpV9+JpYE?47KSM<<@$sa~rG^j5-LaTU+5<iw*<-x0`pM54t?eCsE&3ijyKNIm~Ih
z8soVH{M<SDI!$?yL|R4otSzrv@Lr<bJiD77E%)(Gmq?9kNiS|fL2hM0s&FeEQGh8v
z4cmmyT2{!lsc>9)#EcnXhBsGHU}8W#NjY$0zhTXc1jb}&j5pTGU!5hsM;oNdbUT<%
zj;x1Af4j`YJ(~|OJ0k<9S+$aTqt*&*djS+@tQ+g%lgl?wk{uVWmtiL059}$L^G&V-
zDASK@-ab}O=j(}Q5kCzO2|~mZls|J3o=9frRdyIFXpcqr%xFsinI6zmw1_$*geDuz
z5;nCttq6Hha~R0orF`R@{6NPnRFLRnSExCPjreNwtCySf>RH##l$5LGEEj=XXPh~<
z=~TAzXhtiH9J+M6GaSs2%&I;ePT|ONOL+ZMO?m>O(g}Lv_-Q7sYTsaZ7V-)ktzMn%
zF~XF_{8XKl3PAg}J#wC#=za*A%yKrnKx{$Dt<n+S2fGbO_Ltsc0LZqzt#aYa#I-hJ
z%NKmv$ymR{D3n)n=ZC5!Kxum;vHdnL9Diwb-t6FZ?sntg>1x~B?Pv2S7SqMiuy>zl
zGyN#`7p3K9kvpR*v1Y3>@5p2ou;C2pvlH|C&3jB~A1l)L+If@mH>S+3{Bk!9CxhQX
zBoficO|Q6##Y+>5eL&60s=C9<_!>z_=Dd``mh_J4WsBCShKH)>gB|_MQQEx3SGOyA
zbM)bP+n8eBHap1y?g$=IVsNk5>mgX7g&f!{J(xH{1iwh`tnW0>Scz^1;1JN<P7CNO
zFXt(%ry>vdnXj<%ChiXP?RZV$SC5^K^U2GMXlVJXGYu-iG@wi^sv1E&CM-8~k~l+X
zw!#<zL$%OtUJolKN3QX9@DA{yS@Pgf=96bGnaM<$O8&jLgpy<%g9!=p2@D2~p33>o
z4qPH>F^zgAI20T^QB;&0G&1K?i-U>tW@E(GIgfcnK>DqXl0v)4lFE-~b0*ihb7@=0
zSv^sNFPK+@=OB7(0@%__*-yHU2~}rTjY#}R^%~6tGPmZ*3#&?@?kFmQO~t{5CPT{O
z>l5=^o}TUni#?k&GsW8rVY-st66-Xa?b3pT0g!qa^v|;nFaa7A)Uipbgm80J-Ox`H
zZayegY%^75Fa{*q*kXHdQv4wy`XDzyTgZCJz*NEzBIs*TXgBrSATP8HGBBdR6z+?j
zY!q{1=A~u>IS0eXni0jONR2j?@Pt<^C_}OgLplkKD>F1!Eke{Rxgn+r1bl>I-lZA<
zxWGWwOgu=+RV}R|p(N{T{DxAvP$cn^4@9f4L248#0%OAqC`dDe%lqvvO5@LGb9r6&
zGsgJ~@*o!)y2}YA*B1is6A(k^XJ&j>&AX?<#Yup1PYy~)-ML!>2g5UA-Sx%6{^#6c
zI!yBDAf&uh`A5KKMSJNooPMfjmhs>r<;ktf&$=-EZ4?1RAs1R64pf?nSGIji&qVmr
z7!?vA9!Y`q;cJ|sqlnR1GH!N=Hi6ir17ZNl0Eog1c{o>~y(QqO^8N*7h(wh?>39Hs
zO>aUj)Uw8^`cP}m_pp_{{OqIQqD~wP&9u{SE>}}}q0|*=3dfN5e9d7b+-qK>v5G0d
z0nDjuUjyRGYN@Zez6X$Sj^=p+x$6&e-|?zUhs-X$fM)gZ{6g9X26IWwWBCCo3j6WY
zLLg_??{)lfWHYvvI66zr<3eXy9r}%a3?h%m(cVk;LOr<+q_e16X!B0tH93hvr`ij$
zf$OP23GB)57APnbuNm3bB|$xgMKs$YjN~GR-)5bmwndw)ad_ZLuzAOb8U1SdE9=V&
zFIue{y`Jt}A=eW8t5cwNK?gqg<5~$UYM=yb?eut3Ensmt_zI?-{Bw4N9$1^ka0>~)
zMtKQE*dW9PJWpKesq^`I=m{@<zefM~D5OZW_XSTzhQyp4`U{bphU$?A&$XYtvWc0A
zfGib+=4EI;hobt#*m@M3gt2^}D}qTL%cJse5_$ROGAmWr<~8L$*J4Q|>u40;N02sf
z#79WmuuJb#y@w;unepMfUSXsr@#_jcxAEP%OTp<n=Jy7fk<A>7G)vr#G)Nd0iev~r
zz#a3<(Uh_fVW9O~VPwX`Ipz>wDIeD1M}G90P{k46WW79`YK-ae=s@pP@?aeTU7&?w
z=vUKMF%E+);7g9IjLg)}Hdx#*hamC5!@@&}D)2eaUdR2KtJtn$%;cRh1+*d15a^bZ
z{8coq-fZ|{!okf^3wHeB8gsdAh|lzpT3}jxpLn}<k^lBV;B0?JD|Fn?2hl!4CRxGP
zs=3Y2fvnvVagiOe#L$#*prKPT6p>Q&+(y2ES<M;kQpVqk{Xp+!D^*Lu0qPbSWy<Nx
z*FyFE;^o~fRPUZ#Za;T%P?!CDz?YrccyQTW+I)J+e;O**Oya*YE>mVIMqz<??rzBE
zr6JtkZL~^&7T`4FxmA)kL@;;rbaQ&3C~|~S<ULF}(hfc_cTj9oIo>kZU+*`!aJswg
zSavKskAQL9`T??c@HjP82MLsM(`Foa{;Yeiz3tby(K(U($cbKu;+n!**5B;m^@6+{
zKWHdWK{2pfw%8WBm&=JE$TF{BZ>k{#T%-0ApS9FwIP)_@`V?28_7?78jH<e>kZ()^
zNwY5tNnonM<%)9#qex=Z$YJiwB3=qylG(0btl=j`Jti6B>#qddn;;=asabe0aIfB|
zfN4Fa6_Sfjf}xRnOx^Rsku&@n+CjUNr^rdgVkx(T{%v6Py0ic`ukX3U6|J9ukss*?
zV0etr+QPY?MFmRxPZQub^s7Dn6U$F1$Lr4<G<So%t-18$Izp`Y<L;M-Pu^MF>9I)O
z#7#`AO$vTK_bj>7OrV)|zD-)aJGVB<@Z@xJdc3|fzy4eVdwlv>J%$u$f{mXLPq^ug
zMB0T*4TeoEFAO3^GNbMWyRy}YMw(gOu;)FJGa*{G$)D#D#G7YkmRT&bHnJrVdsPa9
zyDNN@I}dV@F2u;{yRI3g0xx-Z<+W~_&c`HDpNOvni9bX=V?nB}L|9`jg$7mM%#Ax4
z&tg1??6@P*l-&oD5QH$!a9E;anA&Rt8m*?&#U|^G)V^7w>peUc!~0wzQ&X*opnZ4I
zQq&)Z3*9jGMUw5#6jlR%HuxNMCSfh7SrMnnN)w&tra3V5LCO<8h%JS6U*1cklP+Om
zC~&f6ZDJ;Y2?;cjzvrh-me<k-kQDZh-so@gf1{!;J$p&qe_^YhAgf+duW=ww1jMaS
zG=^WqoI43EnfB5}c1|&OLc{}5VT0O4s6J?auIn`@k!6h2{^GUQ&hE4EZp94}-xP=v
z=-$m&nX%4r<jkQ{Be+E0(VnQJ?BFDBOc=ITuu@QpAPSn%m$_Pg)qBsb-lfd(Dq3aK
z5{^4{#Pukq%{mrHaE}(AM^K#McQ*aSIhCzD`{H@W<#NYXz~?1lsys~@3;7ZAu*#2b
zDcl{#!N8&1S3z)T<sk+U3=vpxNWMsG&clCf{*>eqhCpT7yf)QZro$l;nI3^=a3z}~
zmx$+rxCg@QeF{}_@-2Q>QJ|ZKaH^vPob@$Alf+r+#$Efkp|z<@Zr(0nz3g#QQn`@5
zbiOn}P;B1>cM-)d_gI9r^8IIkLve?r)Td}?QM>wzgp7@SOt4c(7mGV*d~5p6KC%Z5
z)95#+E^=1gB(;UZoIJSGv)rJ&6ipt5O@q$K8+TCkSbDMS8b)ra^Kou<>l(?HTh4gm
zI}?@%1THgkmYe5|9V3#4RVzQe{IPt)j^R1(l>47nx;SOXd~G}QM};5JnTBAiovj0x
zu1b$ewyozpV#_7$JIlM?`q+8vD+zb_zFJUF6Q(bZZ=e_|`?*<9o=Xqag<GnFEfI&f
zcPb)pcGXv}T|Y_Q=5r$(66ptX*Y7&pr`EVCbtSg!TtClp@7Me2OAuy@P3T)L$AdR%
zS?zOTR#8Qv<N<tv`d_?w8=d1{m@f?mH6rXk81oY&^S?;An3!SyNxOejW;1qLs=pBG
z|ATgyu(SLX1iZ!`_6NGno7aC8)MvkeL0~1;gO#m?)$*+Ug+>em0H6Q}0XB}VZl?D3
zEG`!BG&SG=FmAR5|4sG5<GgpEp#dYzi2>#rt_AV=#tsw6dh=(drEJUyrPSO{ULV;j
zPn@w-!?~T_;wg>ez9+0tr~9z{6(h?SM66Q=mu9?sZ(8G?4A)RxcZl-rL;Vc*D#5~X
z+WC2Aoby>Ze&9Q3(3s^-$Dti3E49d8y;xfsebP~{-8(4VuxKepsLi-!T?My7mFeJy
z6C6&hhH=r>b57{7*ZVqX#!3_yOHmoB!c~5Hm*<lT1>sKSw6ASDcefp{H|kixUWbDm
zZ*oB=Pw;<!kl%lcp9j0CxS;`nSy*r`KPhN9sf-O5e(j6$`id<c7F4+p7MwG*1nHvW
zJ2Y4^!o24u&kEZUF;5~T2ID7QRZ~(QM=4<?mSHhc<#q+o!oD?|OUVzm@z)Zi%B0ma
zVbArbloa3(@TzZ*%dqFU(gOGW(1ZexmD@Yoz`HP?AVo3l1N+f$+44y8@^Y-USIa<#
zYe9#>t?0hn-dwUyVw($x*23Asu@l10OHe(DO9=re#`s$*s5?Qp`)YFv23U?RsT66e
zaEBY8PUjCzK&gW(ady`xx;ZA|N4PIIYw2z5WFlXCej@m<oFwMiDZS)=LB*D6g?b!b
z-F{c502nS3kA6J;I5N#VrSdfBa1aR6-QbHfjm;@&AZ-#sk4*{?p}DN1Iz!i2t#GYJ
z4V*;L#(MZbQE7z*HHLf#O;FD-ApQyPRr&`EN6&2C3(1O%=*WkiPrfcnmEGw#3lG`%
zo@a*dna_e2N$S`;84AqU+IW5PNlp~`Z(j)3dg%}$PYfWz*v#(&lSBi$7rgPH%0`cg
zc$ac<(hQyXk<8NlvW9UQVs*n2E^aXIWWLvyUFIUK!XAGH>LT{Cpf0VnGFH(i(>;rf
z<~O2QaIPqg8Rm=kIwbVADaZ3rX{2G&D0MUoD2ehbsz;R>HT=opgM>1?wG1-sZ2HLV
z<paR=I^Lyc5A^CQ06jtH2MaX$6lO{2u5r{lHn|TEMtQcwbDTjhkxGw{E&R_$4hv;-
zC2Zd_8rBv!MZd`Mmc2Pq+3eoc8o#K1{7Ve&_o`Z(mdFNk3d!j}FPA}&E(?zK8f0Gx
z;5-Ejs^P@+k~%oF1`Cp+v8Rxfypw|8k{~R>*VM{{1tRcn`)cd%q@=zI&suPChWdpH
z1&s^yH@OX9h!7X$?`Rz=!j!lK902g`SH=U@ukHK0{MyZc!k|}Z;2;q~&|e~XfBFn4
zXmXhUiRj7xqtibt#D8J{0GNPd(OPT(z}(5v&C=10^&j5gZ$fduZ6yDvjlUh)$>>Ih
z*e^8OUpEE-Y%h!obBYZBv!dfs|E>S}m)>AUQ4(km9B_;%8R*}%{?|a^Z(V;Ky#wB#
zmRp!Qyl1g>{Z9v=zT4rAi3k8Air_#C(}KxF=xF|pDgW@_Sfa$x1x#ROQHuY2oPW&u
zZ+AW-O2UWD_NR^SO|2|l|Cr<dL>Yw`F|-yNm|u+YKe8?0S93ykaHbfs!M{QOyCdQE
z()eRdsqp~*-va_u9GCK6z3Lx1IKL5omp~{9KCpy1HRAtl5=U`-=1PIT$<lFsry>sr
S|GN|VuPXr-0FV*<{q$exl%sS2

diff --git a/testing/talos/talos/tests/devtools/addon/install.rdf b/testing/talos/talos/tests/devtools/addon/install.rdf
index c4b373991eb3..a6b341c75ae7 100644
--- a/testing/talos/talos/tests/devtools/addon/install.rdf
+++ b/testing/talos/talos/tests/devtools/addon/install.rdf
@@ -3,7 +3,7 @@
 <!-- Required Items -->
 <em:id>bug1150215@mozilla.org</em:id>
 <em:name>DAMP - Devtools At Maximum Performance</em:name>
-<em:version>0.0.2</em:version>
+<em:version>0.0.5</em:version>
 
 <em:targetApplication>
     <Description>

From 0320133b2fb2e851a9cae542e4ce2c2403caa6cc Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 3 Oct 2016 10:16:51 -0700
Subject: [PATCH 46/57] Bug 1307151 - Clear prefs in a cleanup function in
 browser_webconsole_bug_737873_mixedcontent.js;r=me

MozReview-Commit-ID: 7X5NVOcvop8
---
 .../test/browser_webconsole_bug_737873_mixedcontent.js    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
index a6ce1d83a041..4665af42a33f 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
@@ -13,6 +13,11 @@ const TEST_HTTPS_URI = "https://example.com/browser/devtools/client/" +
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
                        "Mixed_content";
 
+registerCleanupFunction(function*() {
+  Services.prefs.clearUserPref("security.mixed_content.block_display_content");
+  Services.prefs.clearUserPref("security.mixed_content.block_active_content");
+});
+
 add_task(function* () {
   Services.prefs.setBoolPref("security.mixed_content.block_display_content",
                              false);
@@ -24,9 +29,6 @@ add_task(function* () {
   let hud = yield openConsole();
 
   yield testMixedContent(hud);
-
-  Services.prefs.clearUserPref("security.mixed_content.block_display_content");
-  Services.prefs.clearUserPref("security.mixed_content.block_active_content");
 });
 
 var testMixedContent = Task.async(function* (hud) {

From d5f0e3743a988292a0ab6374e48c433d2ff0250d Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 3 Oct 2016 11:46:14 -0700
Subject: [PATCH 47/57] Bug 1307198 - Set -moz-user-focus: normal to fix text
 focus on new output area;r=linclark

MozReview-Commit-ID: 7mIXo72WBhW
---
 devtools/client/themes/webconsole.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css
index 600df05bb4dd..b02818a5043d 100644
--- a/devtools/client/themes/webconsole.css
+++ b/devtools/client/themes/webconsole.css
@@ -689,6 +689,7 @@ a.learn-more-link.webconsole-learn-more-link {
   display: flex;
   flex-direction: column;
   height: 100%;
+  -moz-user-focus: normal;
 }
 
 .webconsole-filterbar-wrapper {

From 505bdeb873c951710fee8d11ba5bc42061ff71fe Mon Sep 17 00:00:00 2001
From: Jan Odvarko <odvarko@gmail.com>
Date: Mon, 3 Oct 2016 13:33:53 +0200
Subject: [PATCH 48/57] Bug 1306898 - Avoid exception. r=ntim

---
 devtools/client/shared/components/reps/rep.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/client/shared/components/reps/rep.js b/devtools/client/shared/components/reps/rep.js
index 263b48e2ee4d..90b5b55a704f 100644
--- a/devtools/client/shared/components/reps/rep.js
+++ b/devtools/client/shared/components/reps/rep.js
@@ -102,7 +102,7 @@ define(function (require, exports, module) {
     let type = typeof object;
     if (type == "object" && object instanceof String) {
       type = "string";
-    } else if (type == "object" && object.type === "symbol") {
+    } else if (object && type == "object" && object.type === "symbol") {
       type = "symbol";
     }
 

From 8ef8a5df9f37faba7dcca04d2f94da4dd1c10c58 Mon Sep 17 00:00:00 2001
From: Jan Odvarko <odvarko@gmail.com>
Date: Wed, 28 Sep 2016 14:48:43 +0200
Subject: [PATCH 49/57] Bug 1305979 - Improve API for adding a new side panels.
 r=jdescottes

---
 devtools/client/inspector/inspector.js   | 14 ++++++++++
 devtools/client/inspector/toolsidebar.js | 34 +++++++++++++++++++-----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/devtools/client/inspector/inspector.js b/devtools/client/inspector/inspector.js
index ddf5d1f406c5..c94fea472f9c 100644
--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@@ -600,6 +600,20 @@ Inspector.prototype = {
     this.sidebar.show(defaultTab);
   },
 
+  /**
+   * Register a side-panel tab. This API can be used outside of
+   * DevTools (e.g. from an extension) as well as by DevTools
+   * code base.
+   *
+   * @param {string} tab uniq id
+   * @param {string} title tab title
+   * @param {React.Component} panel component. See `InspectorPanelTab` as an example.
+   * @param {boolean} selected true if the panel should be selected
+   */
+  addSidebarTab: function (id, title, panel, selected) {
+    this.sidebar.addTab(id, title, panel, selected);
+  },
+
   setupToolbar: function () {
     this.teardownToolbar();
 
diff --git a/devtools/client/inspector/toolsidebar.js b/devtools/client/inspector/toolsidebar.js
index e4e435b17466..d013b7b84c46 100644
--- a/devtools/client/inspector/toolsidebar.js
+++ b/devtools/client/inspector/toolsidebar.js
@@ -84,6 +84,27 @@ ToolSidebar.prototype = {
     this._tabbar = this.ReactDOM.render(sidebar, this._tabbox);
   },
 
+  /**
+   * Register a side-panel tab.
+   *
+   * @param {string} tab uniq id
+   * @param {string} title tab title
+   * @param {React.Component} panel component. See `InspectorPanelTab` as an example.
+   * @param {boolean} selected true if the panel should be selected
+   */
+  addTab: function (id, title, panel, selected) {
+    this._tabbar.addTab(id, title, selected, panel);
+    this.emit("new-tab-registered", id);
+  },
+
+  /**
+   * Helper API for adding side-panels that use existing DOM nodes
+   * (defined within inspector.xhtml) as the content.
+   *
+   * @param {string} tab uniq id
+   * @param {string} title tab title
+   * @param {boolean} selected true if the panel should be selected
+   */
   addExistingTab: function (id, title, selected) {
     let panel = this.InspectorTabPanel({
       id: id,
@@ -92,17 +113,18 @@ ToolSidebar.prototype = {
       title: title,
     });
 
-    this._tabbar.addTab(id, title, selected, panel);
-
-    this.emit("new-tab-registered", id);
+    this.addTab(id, title, panel, selected);
   },
 
   /**
-   * Register a tab. A tab is a document.
+   * Helper API for adding side-panels that use existing <iframe> nodes
+   * (defined within inspector.xhtml) as the content.
    * The document must have a title, which will be used as the name of the tab.
    *
    * @param {string} tab uniq id
+   * @param {string} title tab title
    * @param {string} url
+   * @param {boolean} selected true if the panel should be selected
    */
   addFrameTab: function (id, title, url, selected) {
     let panel = this.InspectorTabPanel({
@@ -114,9 +136,7 @@ ToolSidebar.prototype = {
       onMount: this.onSidePanelMounted.bind(this),
     });
 
-    this._tabbar.addTab(id, title, selected, panel);
-
-    this.emit("new-tab-registered", id);
+    this.addTab(id, title, panel, selected);
   },
 
   onSidePanelMounted: function (content, props) {

From b4c5400f7795851a72befc30f8089f207efebcab Mon Sep 17 00:00:00 2001
From: Dimi Lee <dlee@mozilla.com>
Date: Tue, 4 Oct 2016 09:14:39 +0800
Subject: [PATCH 50/57] Bug 1305801 - Part 5: Support SafeBrowsing v4 partial
 update. r=gcp

MozReview-Commit-ID: 7OEWLaZbotS

--HG--
extra : rebase_source : dea720f726306238f7fe3687d7c2579410923752
---
 toolkit/components/telemetry/Histograms.json  |   8 +
 .../components/url-classifier/Classifier.cpp  |  41 +-
 .../components/url-classifier/HashStore.cpp   |   2 +-
 toolkit/components/url-classifier/HashStore.h |  10 +-
 .../components/url-classifier/LookupCache.cpp |  52 ---
 .../components/url-classifier/LookupCache.h   |  27 --
 .../url-classifier/LookupCacheV4.cpp          | 299 ++++++++++++++
 .../components/url-classifier/LookupCacheV4.h |  61 +++
 toolkit/components/url-classifier/moz.build   |   2 +
 .../tests/gtest/TestPerProviderDirectory.cpp  |   1 +
 .../gtest/TestUrlClassifierTableUpdateV4.cpp  | 377 +++++++++++++++++-
 11 files changed, 780 insertions(+), 100 deletions(-)
 create mode 100644 toolkit/components/url-classifier/LookupCacheV4.cpp
 create mode 100644 toolkit/components/url-classifier/LookupCacheV4.h

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 96c0a022d6ce..4c7947f863d9 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3821,6 +3821,14 @@
     "bug_numbers": [1172688],
     "description": "This metric is recorded every time a gethash lookup is performed, `true` is recorded if the lookup times out."
   },
+  "URLCLASSIFIER_UPDATE_ERROR_TYPE": {
+    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
+    "expires_in_version": "58",
+    "kind": "enumerated",
+    "n_values": 10,
+    "bug_numbers": [1305801],
+    "description": "An error was encountered while parsing a partial update returned by a Safe Browsing V4 server (0 = addition of an already existing prefix, 1 = parser got into an infinite loop, 2 = removal index out of bounds)"
+  },
   "CSP_DOCUMENTS_COUNT": {
     "alert_emails": ["seceng@mozilla.com"],
     "bug_numbers": [1252829],
diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp
index c675d54b8ae1..efbc8ef570e6 100644
--- a/toolkit/components/url-classifier/Classifier.cpp
+++ b/toolkit/components/url-classifier/Classifier.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Classifier.h"
+#include "LookupCacheV4.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsISimpleEnumerator.h"
@@ -946,7 +947,14 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
     return NS_ERROR_FAILURE;
   }
 
-  PrefixStringMap prefixes;
+  nsresult rv = NS_OK;
+
+  // prefixes2 is only used in partial update. If there are multiple
+  // updates for the same table, prefixes1 & prefixes2 will act as
+  // input and output in turn to reduce memory copy overhead.
+  PrefixStringMap prefixes1, prefixes2;
+  PrefixStringMap* output = &prefixes1;
+
   for (uint32_t i = 0; i < aUpdates->Length(); i++) {
     TableUpdate *update = aUpdates->ElementAt(i);
     if (!update || !update->TableName().Equals(aTable)) {
@@ -957,23 +965,44 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
     NS_ENSURE_TRUE(updateV4, NS_ERROR_FAILURE);
 
     if (updateV4->IsFullUpdate()) {
-      prefixes.Clear();
-      TableUpdateV4::PrefixesStringMap& map = updateV4->Prefixes();
+      TableUpdateV4::PrefixStdStringMap& map = updateV4->Prefixes();
 
+      output->Clear();
       for (auto iter = map.Iter(); !iter.Done(); iter.Next()) {
         // prefixes is an nsClassHashtable object stores prefix string.
         // It will take the ownership of the put object.
         nsCString* prefix = new nsCString(iter.Data()->GetPrefixString());
-        prefixes.Put(iter.Key(), prefix);
+        output->Put(iter.Key(), prefix);
       }
     } else {
-      // TODO: Bug 1287058, partial update
+      PrefixStringMap* input = nullptr;
+      // If both prefix sets are empty, this means we are doing a partial update
+      // without a prior full/partial update in the loop. In this case we should
+      // get prefixes from the lookup cache first.
+      if (prefixes1.IsEmpty() && prefixes2.IsEmpty()) {
+        lookupCache->GetPrefixes(prefixes1);
+        input = &prefixes1;
+        output = &prefixes2;
+      } else {
+        MOZ_ASSERT(prefixes1.IsEmpty() ^ prefixes2.IsEmpty());
+
+        // When there are multiple partial updates, input should always point
+        // to the non-empty prefix set(filled by previous full/partial update).
+        // output should always point to the empty prefix set.
+        input = prefixes1.IsEmpty() ? &prefixes2 : &prefixes1;
+        output = prefixes1.IsEmpty() ? &prefixes1 : &prefixes2;
+      }
+
+      rv = lookupCache->ApplyPartialUpdate(updateV4, *input, *output);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      input->Clear();
     }
 
     aUpdates->ElementAt(i) = nullptr;
   }
 
-  nsresult rv = lookupCache->Build(prefixes);
+  rv = lookupCache->Build(*output);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = lookupCache->WriteFile();
diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp
index 00da5fb7b33c..289b1823ff80 100644
--- a/toolkit/components/url-classifier/HashStore.cpp
+++ b/toolkit/components/url-classifier/HashStore.cpp
@@ -168,7 +168,7 @@ TableUpdateV4::NewPrefixes(int32_t aSize, std::string& aPrefixes)
   NS_ENSURE_TRUE_VOID(aPrefixes.size() % aSize == 0);
   NS_ENSURE_TRUE_VOID(!mPrefixesMap.Get(aSize));
 
-  PrefixString* prefix = new PrefixString(aPrefixes);
+  PrefixStdString* prefix = new PrefixStdString(aPrefixes);
   mPrefixesMap.Put(aSize, prefix);
 }
 
diff --git a/toolkit/components/url-classifier/HashStore.h b/toolkit/components/url-classifier/HashStore.h
index 1796ea9a33ea..06c070819208 100644
--- a/toolkit/components/url-classifier/HashStore.h
+++ b/toolkit/components/url-classifier/HashStore.h
@@ -132,13 +132,13 @@ private:
 // for addition and indices to removal. See Bug 1283009.
 class TableUpdateV4 : public TableUpdate {
 public:
-  struct PrefixString {
+  struct PrefixStdString {
   private:
     std::string mStorage;
     nsDependentCSubstring mString;
 
   public:
-    explicit PrefixString(std::string& aString)
+    explicit PrefixStdString(std::string& aString)
     {
       aString.swap(mStorage);
       mString.Rebind(mStorage.data(), mStorage.size());
@@ -147,7 +147,7 @@ public:
     const nsACString& GetPrefixString() const { return mString; };
   };
 
-  typedef nsClassHashtable<nsUint32HashKey, PrefixString> PrefixesStringMap;
+  typedef nsClassHashtable<nsUint32HashKey, PrefixStdString> PrefixStdStringMap;
   typedef nsTArray<int32_t> RemovalIndiceArray;
 
 public:
@@ -163,7 +163,7 @@ public:
   }
 
   bool IsFullUpdate() const { return mFullUpdate; }
-  PrefixesStringMap& Prefixes() { return mPrefixesMap; }
+  PrefixStdStringMap& Prefixes() { return mPrefixesMap; }
   RemovalIndiceArray& RemovalIndices() { return mRemovalIndiceArray; }
 
   // For downcasting.
@@ -177,7 +177,7 @@ private:
   virtual int Tag() const override { return TAG; }
 
   bool mFullUpdate;
-  PrefixesStringMap mPrefixesMap;
+  PrefixStdStringMap mPrefixesMap;
   RemovalIndiceArray mRemovalIndiceArray;
 };
 
diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp
index cbb7b8141d18..328e55619cbc 100644
--- a/toolkit/components/url-classifier/LookupCache.cpp
+++ b/toolkit/components/url-classifier/LookupCache.cpp
@@ -41,7 +41,6 @@ namespace mozilla {
 namespace safebrowsing {
 
 const int LookupCacheV2::VER = 2;
-const int LookupCacheV4::VER = 4;
 
 LookupCache::LookupCache(const nsACString& aTableName, nsIFile* aRootStoreDir)
   : mPrimed(false)
@@ -588,56 +587,5 @@ LookupCacheV2::DumpCompletions()
 }
 #endif
 
-nsresult
-LookupCacheV4::Init()
-{
-  mVLPrefixSet = new VariableLengthPrefixSet();
-  nsresult rv = mVLPrefixSet->Init(mTableName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-// TODO : Bug 1298257, Implement url matching for variable-length prefix set
-nsresult
-LookupCacheV4::Has(const Completion& aCompletion,
-                   bool* aHas, bool* aComplete)
-{
-  *aHas = false;
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV4::Build(PrefixStringMap& aPrefixMap)
-{
-  return mVLPrefixSet->SetPrefixes(aPrefixMap);
-}
-
-nsresult
-LookupCacheV4::ClearPrefixes()
-{
-  // Clear by seting a empty map
-  PrefixStringMap map;
-  return mVLPrefixSet->SetPrefixes(map);
-}
-
-nsresult
-LookupCacheV4::StoreToFile(nsIFile* aFile)
-{
-  return mVLPrefixSet->StoreToFile(aFile);
-}
-
-nsresult
-LookupCacheV4::LoadFromFile(nsIFile* aFile)
-{
-  return mVLPrefixSet->LoadFromFile(aFile);
-}
-
-size_t
-LookupCacheV4::SizeOfPrefixSet()
-{
-  return mVLPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
-}
-
 } // namespace safebrowsing
 } // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h
index 91c24da422b6..9bc96624197a 100644
--- a/toolkit/components/url-classifier/LookupCache.h
+++ b/toolkit/components/url-classifier/LookupCache.h
@@ -202,33 +202,6 @@ private:
   RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
 };
 
-class LookupCacheV4 final : public LookupCache
-{
-public:
-  explicit LookupCacheV4(const nsACString& aTableName, nsIFile* aStoreFile)
-    : LookupCache(aTableName, aStoreFile) {}
-  ~LookupCacheV4() {}
-
-  virtual nsresult Init() override;
-  virtual nsresult Has(const Completion& aCompletion,
-                       bool* aHas, bool* aComplete) override;
-
-  nsresult Build(PrefixStringMap& aPrefixMap);
-
-  static const int VER;
-
-protected:
-  virtual nsresult ClearPrefixes() override;
-  virtual nsresult StoreToFile(nsIFile* aFile) override;
-  virtual nsresult LoadFromFile(nsIFile* aFile) override;
-  virtual size_t SizeOfPrefixSet() override;
-
-private:
-  virtual int Ver() const override { return VER; }
-
-  RefPtr<VariableLengthPrefixSet> mVLPrefixSet;
-};
-
 } // namespace safebrowsing
 } // namespace mozilla
 
diff --git a/toolkit/components/url-classifier/LookupCacheV4.cpp b/toolkit/components/url-classifier/LookupCacheV4.cpp
new file mode 100644
index 000000000000..8560d02aae1f
--- /dev/null
+++ b/toolkit/components/url-classifier/LookupCacheV4.cpp
@@ -0,0 +1,299 @@
+//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#include "LookupCacheV4.h"
+#include "HashStore.h"
+
+// MOZ_LOG=UrlClassifierDbService:5
+extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
+#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args)
+#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug)
+
+namespace mozilla {
+namespace safebrowsing {
+
+const int LookupCacheV4::VER = 4;
+
+// Prefixes coming from updates and VLPrefixSet are both stored in the HashTable
+// where the (key, value) pair is a prefix size and a lexicographic-sorted string.
+// The difference is prefixes from updates use std:string(to avoid additional copies)
+// and prefixes from VLPrefixSet use nsCString.
+// This class provides a common interface for the partial update algorithm to make it
+// easier to operate on two different kind prefix string map..
+class VLPrefixSet
+{
+public:
+  explicit VLPrefixSet(const PrefixStringMap& aMap);
+  explicit VLPrefixSet(const TableUpdateV4::PrefixStdStringMap& aMap);
+
+  // This function will merge the prefix map in VLPrefixSet to aPrefixMap.
+  void Merge(PrefixStringMap& aPrefixMap);
+
+  // Find the smallest string from the map in VLPrefixSet.
+  bool GetSmallestPrefix(nsDependentCSubstring& aOutString);
+
+  // Return the number of prefixes in the map
+  uint32_t Count() const { return mCount; }
+
+private:
+  // PrefixString structure contains a lexicographic-sorted string with
+  // a |pos| variable to indicate which substring we are pointing to right now.
+  // |pos| increases each time GetSmallestPrefix finds the smallest string.
+  struct PrefixString {
+    PrefixString(const nsACString& aStr, uint32_t aSize)
+     : pos(0)
+     , size(aSize)
+    {
+      data.Rebind(aStr.BeginReading(), aStr.Length());
+    }
+
+    const char* get() {
+      return pos < data.Length() ? data.BeginReading() + pos : nullptr;
+    }
+    void next() { pos += size; }
+    uint32_t remaining() { return data.Length() - pos; }
+
+    nsDependentCSubstring data;
+    uint32_t pos;
+    uint32_t size;
+  };
+
+  nsClassHashtable<nsUint32HashKey, PrefixString> mMap;
+  uint32_t mCount;
+};
+
+nsresult
+LookupCacheV4::Init()
+{
+  mVLPrefixSet = new VariableLengthPrefixSet();
+  nsresult rv = mVLPrefixSet->Init(mTableName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+// TODO : Bug 1298257, Implement url matching for variable-length prefix set
+nsresult
+LookupCacheV4::Has(const Completion& aCompletion,
+                   bool* aHas, bool* aComplete)
+{
+  *aHas = false;
+  return NS_OK;
+}
+
+nsresult
+LookupCacheV4::Build(PrefixStringMap& aPrefixMap)
+{
+  return mVLPrefixSet->SetPrefixes(aPrefixMap);
+}
+
+nsresult
+LookupCacheV4::GetPrefixes(PrefixStringMap& aPrefixMap)
+{
+  return mVLPrefixSet->GetPrefixes(aPrefixMap);
+}
+
+nsresult
+LookupCacheV4::ClearPrefixes()
+{
+  // Clear by seting a empty map
+  PrefixStringMap map;
+  return mVLPrefixSet->SetPrefixes(map);
+}
+
+nsresult
+LookupCacheV4::StoreToFile(nsIFile* aFile)
+{
+  return mVLPrefixSet->StoreToFile(aFile);
+}
+
+nsresult
+LookupCacheV4::LoadFromFile(nsIFile* aFile)
+{
+  return mVLPrefixSet->LoadFromFile(aFile);
+}
+
+size_t
+LookupCacheV4::SizeOfPrefixSet()
+{
+  return mVLPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
+}
+
+static void
+AppendPrefixToMap(PrefixStringMap& prefixes, nsDependentCSubstring& prefix)
+{
+  if (!prefix.Length()) {
+    return;
+  }
+
+  nsCString* prefixString = prefixes.LookupOrAdd(prefix.Length());
+  prefixString->Append(prefix.BeginReading(), prefix.Length());
+}
+
+// Please see https://bug1287058.bmoattachments.org/attachment.cgi?id=8795366
+// for detail about partial update algorithm.
+nsresult
+LookupCacheV4::ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
+                                  PrefixStringMap& aInputMap,
+                                  PrefixStringMap& aOutputMap)
+{
+  MOZ_ASSERT(aOutputMap.IsEmpty());
+
+  // oldPSet contains prefixes we already have or we just merged last round.
+  // addPSet contains prefixes stored in tableUpdate which should be merged with oldPSet.
+  VLPrefixSet oldPSet(aInputMap);
+  VLPrefixSet addPSet(aTableUpdate->Prefixes());
+
+  // RemovalIndiceArray is a sorted integer array indicating the index of prefix we should
+  // remove from the old prefix set(according to lexigraphic order).
+  // |removalIndex| is the current index of RemovalIndiceArray.
+  // |numOldPrefixPicked| is used to record how many prefixes we picked from the old map.
+  TableUpdateV4::RemovalIndiceArray& removalArray = aTableUpdate->RemovalIndices();
+  uint32_t removalIndex = 0;
+  int32_t numOldPrefixPicked = -1;
+
+  nsDependentCSubstring smallestOldPrefix;
+  nsDependentCSubstring smallestAddPrefix;
+
+  // This is used to avoid infinite loop for partial update algorithm.
+  // The maximum loops will be the number of old prefixes plus the number of add prefixes.
+  uint32_t index = oldPSet.Count() + addPSet.Count() + 1;
+  for(;index > 0; index--) {
+    // Get smallest prefix from the old prefix set if we don't have one
+    if (smallestOldPrefix.IsEmpty()) {
+      // If prefixes from the old prefix set are all merged,
+      // then we can merge the entire add prefix set directly.
+      if (!oldPSet.GetSmallestPrefix(smallestOldPrefix)) {
+        AppendPrefixToMap(aOutputMap, smallestAddPrefix);
+        addPSet.Merge(aOutputMap);
+        break;
+      }
+    }
+
+    // Get smallest prefix from add prefix set if we don't have one
+    if (smallestAddPrefix.IsEmpty()) {
+      // If add prefixes are all merged and there is no removalIndices left,
+      // then merge the entire old prefix set directly. If there are still
+      // removalIndices left, we should still merge prefixes one by one
+      // to know which prefix from old prefix set should be removed.
+      if (!addPSet.GetSmallestPrefix(smallestAddPrefix) &&
+        removalIndex >= removalArray.Length()) {
+        AppendPrefixToMap(aOutputMap, smallestOldPrefix);
+        oldPSet.Merge(aOutputMap);
+        break;
+      }
+    }
+
+    // Compare the smallest string in old prefix set and add prefix set, merge the
+    // smaller one into new map to ensure merged string still follows
+    // lexigraphic order.
+    if (smallestOldPrefix < smallestAddPrefix ||
+        smallestAddPrefix.IsEmpty()) {
+      numOldPrefixPicked++;
+
+      // If the number of picks from old map matches the removalIndex, then this prefix
+      // will be removed by not merging it to new map.
+      if (removalIndex < removalArray.Length() &&
+          numOldPrefixPicked == removalArray[removalIndex]) {
+        removalIndex++;
+      } else {
+        AppendPrefixToMap(aOutputMap, smallestOldPrefix);
+      }
+      smallestOldPrefix.SetLength(0);
+    } else if (smallestOldPrefix > smallestAddPrefix ||
+               smallestOldPrefix.IsEmpty()){
+      AppendPrefixToMap(aOutputMap, smallestAddPrefix);
+      smallestAddPrefix.SetLength(0);
+    } else {
+      NS_WARNING("Add prefix should not exist in the original prefix set.");
+      Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+                            DUPLICATE_PREFIX);
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  // We expect index will be greater to 0 because max number of runs will be
+  // the number of original prefix plus add prefix.
+  if (index <= 0) {
+    NS_WARNING("There are still prefixes remaining after reaching maximum runs.");
+    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+                          INFINITE_LOOP);
+    return NS_ERROR_FAILURE;
+  }
+
+  if (removalIndex < removalArray.Length()) {
+    NS_WARNING("There are still prefixes to remove after exhausting the old PrefixSet.");
+    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+                          WRONG_REMOVAL_INDICES);
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+VLPrefixSet::VLPrefixSet(const PrefixStringMap& aMap)
+  : mCount(0)
+{
+  for (auto iter = aMap.ConstIter(); !iter.Done(); iter.Next()) {
+    uint32_t size = iter.Key();
+    mMap.Put(size, new PrefixString(*iter.Data(), size));
+    mCount += iter.Data()->Length() / size;
+  }
+}
+
+VLPrefixSet::VLPrefixSet(const TableUpdateV4::PrefixStdStringMap& aMap)
+  : mCount(0)
+{
+  for (auto iter = aMap.ConstIter(); !iter.Done(); iter.Next()) {
+    uint32_t size = iter.Key();
+    mMap.Put(size, new PrefixString(iter.Data()->GetPrefixString(), size));
+    mCount += iter.Data()->GetPrefixString().Length() / size;
+  }
+}
+
+void
+VLPrefixSet::Merge(PrefixStringMap& aPrefixMap) {
+  for (auto iter = mMap.ConstIter(); !iter.Done(); iter.Next()) {
+    nsCString* prefixString = aPrefixMap.LookupOrAdd(iter.Key());
+    PrefixString* str = iter.Data();
+
+    if (str->get()) {
+      prefixString->Append(str->get(), str->remaining());
+    }
+  }
+}
+
+bool
+VLPrefixSet::GetSmallestPrefix(nsDependentCSubstring& aOutString) {
+  PrefixString* pick = nullptr;
+  for (auto iter = mMap.ConstIter(); !iter.Done(); iter.Next()) {
+    PrefixString* str = iter.Data();
+
+    if (!str->get()) {
+      continue;
+    }
+
+    if (aOutString.IsEmpty()) {
+      aOutString.Rebind(str->get(), iter.Key());
+      pick = str;
+      continue;
+    }
+
+    nsDependentCSubstring cur(str->get(), iter.Key());
+    if (cur < aOutString) {
+      aOutString.Rebind(str->get(), iter.Key());
+      pick = str;
+    }
+  }
+
+  if (pick) {
+    pick->next();
+  }
+
+  return pick != nullptr;
+}
+
+} // namespace safebrowsing
+} // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCacheV4.h b/toolkit/components/url-classifier/LookupCacheV4.h
new file mode 100644
index 000000000000..960a8d652315
--- /dev/null
+++ b/toolkit/components/url-classifier/LookupCacheV4.h
@@ -0,0 +1,61 @@
+//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef LookupCacheV4_h__
+#define LookupCacheV4_h__
+
+#include "LookupCache.h"
+
+namespace mozilla {
+namespace safebrowsing {
+
+// Forward declaration.
+class TableUpdateV4;
+
+class LookupCacheV4 final : public LookupCache
+{
+public:
+  explicit LookupCacheV4(const nsACString& aTableName, nsIFile* aStoreFile)
+    : LookupCache(aTableName, aStoreFile) {}
+  ~LookupCacheV4() {}
+
+  virtual nsresult Init() override;
+  virtual nsresult Has(const Completion& aCompletion,
+                       bool* aHas, bool* aComplete) override;
+
+  nsresult Build(PrefixStringMap& aPrefixMap);
+
+  nsresult GetPrefixes(PrefixStringMap& aPrefixMap);
+
+  // ApplyPartialUpdate will merge partial update data stored in aTableUpdate
+  // with prefixes in aInputMap.
+  nsresult ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
+                              PrefixStringMap& aInputMap,
+                              PrefixStringMap& aOutputMap);
+
+  static const int VER;
+
+protected:
+  virtual nsresult ClearPrefixes() override;
+  virtual nsresult StoreToFile(nsIFile* aFile) override;
+  virtual nsresult LoadFromFile(nsIFile* aFile) override;
+  virtual size_t SizeOfPrefixSet() override;
+
+private:
+  virtual int Ver() const override { return VER; }
+
+  enum UPDATE_ERROR_TYPES {
+    DUPLICATE_PREFIX = 0,
+    INFINITE_LOOP = 1,
+    WRONG_REMOVAL_INDICES = 2,
+  };
+
+  RefPtr<VariableLengthPrefixSet> mVLPrefixSet;
+};
+
+} // namespace safebrowsing
+} // namespace mozilla
+
+#endif
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
index 4be366afbb06..411769534a76 100644
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -24,6 +24,7 @@ UNIFIED_SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
     'LookupCache.cpp',
+    'LookupCacheV4.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
     'nsUrlClassifierProxies.cpp',
@@ -62,6 +63,7 @@ EXTRA_JS_MODULES += [
 EXPORTS += [
     'Entries.h',
     'LookupCache.h',
+    'LookupCacheV4.h',
     'nsUrlClassifierPrefixSet.h',
     'protobuf/safebrowsing.pb.h',
     'VariableLengthPrefixSet.h',
diff --git a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
index 0a22baebf530..e0ad04a295b2 100644
--- a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
+++ b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
@@ -1,4 +1,5 @@
 #include "LookupCache.h"
+#include "LookupCacheV4.h"
 #include "HashStore.h"
 #include "gtest/gtest.h"
 #include "nsIThread.h"
diff --git a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
index 3db815f47b91..f1749dbb90c6 100644
--- a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
+++ b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
@@ -5,6 +5,7 @@
 #include "nsIThread.h"
 #include "string.h"
 #include "gtest/gtest.h"
+#include "nsThreadUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::safebrowsing;
@@ -12,6 +13,32 @@ using namespace mozilla::safebrowsing;
 typedef nsCString _Prefix;
 typedef nsTArray<_Prefix> _PrefixArray;
 
+// This function removes common elements of inArray and outArray from
+// outArray. This is used by partial update testcase to ensure partial update
+// data won't contain prefixes we already have.
+static void
+RemoveIntersection(const _PrefixArray& inArray, _PrefixArray& outArray)
+{
+  for (uint32_t i = 0; i < inArray.Length(); i++) {
+    int32_t idx = outArray.BinaryIndexOf(inArray[i]);
+    if (idx >= 0) {
+      outArray.RemoveElementAt(idx);
+    }
+  }
+}
+
+// This fucntion removes elements from outArray by index specified in
+// removal array.
+static void
+RemoveElements(const nsTArray<uint32_t>& removal, _PrefixArray& outArray)
+{
+  for (int32_t i = removal.Length() - 1; i >= 0; i--) {
+    outArray.RemoveElementAt(removal[i]);
+  }
+}
+
+// This function converts lexigraphic-sorted prefixes to a hashtable
+// which key is prefix size and value is concatenated prefix string.
 static void
 PrefixArrayToPrefixStringMap(const _PrefixArray& prefixArray,
                              PrefixStringMap& outMap)
@@ -27,7 +54,6 @@ PrefixArrayToPrefixStringMap(const _PrefixArray& prefixArray,
 
 // N: Number of prefixes, MIN/MAX: minimum/maximum prefix size
 // This function will append generated prefixes to outArray.
-// All elements in the generated array will be different.
 static void
 CreateRandomSortedPrefixArray(uint32_t N,
                               uint32_t MIN,
@@ -59,6 +85,20 @@ CreateRandomSortedPrefixArray(uint32_t N,
   outArray.Sort();
 }
 
+// N: Number of removal indices, MAX: maximum index
+static void
+CreateRandomRemovalIndices(uint32_t N,
+                           uint32_t MAX,
+                           nsTArray<uint32_t>& outArray)
+{
+  for (uint32_t i = 0; i < N; i++) {
+    uint32_t idx = rand() % MAX;
+    if (!outArray.Contains(idx)) {
+      outArray.InsertElementSorted(idx);
+    }
+  }
+}
+
 // Function to generate TableUpdateV4.
 static void
 GenerateUpdateData(bool fullUpdate,
@@ -89,20 +129,21 @@ VerifyPrefixSet(PrefixStringMap& expected)
   NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                          getter_AddRefs(file));
 
-  file->AppendRelativeNativePath(NS_LITERAL_CSTRING("safebrowsing/gtest-malware-proto.pset"));
+  file->AppendNative(NS_LITERAL_CSTRING("safebrowsing"));
+  file->AppendNative(NS_LITERAL_CSTRING("gtest-malware-proto.pset"));
 
   RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
   load->Init(NS_LITERAL_CSTRING("gtest-malware-proto"));
 
-  PrefixStringMap out;
+  PrefixStringMap prefixesInFile;
   load->LoadFromFile(file);
-  load->GetPrefixes(out);
+  load->GetPrefixes(prefixesInFile);
 
   for (auto iter = expected.ConstIter(); !iter.Done(); iter.Next()) {
-    nsCString* str1 = iter.Data();
-    nsCString* str2 = out.Get(iter.Key());
+    nsCString* expectedPrefix = iter.Data();
+    nsCString* resultPrefix = prefixesInFile.Get(iter.Key());
 
-    ASSERT_TRUE(*str1 == *str2);
+    ASSERT_TRUE(*resultPrefix == *expectedPrefix);
   }
 }
 
@@ -112,8 +153,26 @@ Clear()
   nsCOMPtr<nsIFile> file;
   NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                          getter_AddRefs(file));
-  file->AppendRelativeNativePath(NS_LITERAL_CSTRING("safebrowsing/gtest-malware-proto.pset"));
-  file->Remove(false);
+
+  UniquePtr<Classifier> classifier(new Classifier());
+  classifier->Open(*file);
+  classifier->Reset();
+}
+
+static void
+testUpdateFail(nsTArray<TableUpdate*>& tableUpdates)
+{
+  nsCOMPtr<nsIFile> file;
+  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                         getter_AddRefs(file));
+
+  UniquePtr<Classifier> classifier(new Classifier());
+  classifier->Open(*file);
+
+  RunTestInNewThread([&] () -> void {
+    nsresult rv = classifier->ApplyUpdates(&tableUpdates);
+    ASSERT_TRUE(NS_FAILED(rv));
+  });
 }
 
 static void
@@ -145,6 +204,18 @@ testFullUpdate(PrefixStringMap& add)
   testUpdate(tableUpdates, add);
 }
 
+static void
+testPartialUpdate(PrefixStringMap& add,
+                  nsTArray<uint32_t>& removal,
+                  PrefixStringMap& expected)
+{
+  nsTArray<TableUpdate*> tableUpdates;
+  GenerateUpdateData(false, add, removal, tableUpdates);
+
+  testUpdate(tableUpdates, expected);
+}
+
+
 TEST(UrlClassifierTableUpdateV4, FixLenghtPSetFullUpdate)
 {
   srand(time(NULL));
@@ -188,3 +259,291 @@ TEST(UrlClassifierTableUpdateV4, MixedPSetFullUpdate)
 
   Clear();
 }
+
+TEST(UrlClassifierTableUpdateV4, PartialUpdateWithRemoval)
+{
+  _PrefixArray fArray, pArray, mergedArray;
+  PrefixStringMap fMap, pMap, mergedMap;
+
+  {
+    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
+    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    // Remove 1/5 of elements of original prefix set.
+    nsTArray<uint32_t> removal;
+    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+    RemoveElements(removal, fArray);
+
+    // Calculate the expected prefix map.
+    mergedArray.AppendElements(fArray);
+    mergedArray.AppendElements(pArray);
+    mergedArray.Sort();
+    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+
+    testPartialUpdate(pMap, removal, mergedMap);
+  }
+
+  Clear();
+}
+
+TEST(UrlClassifierTableUpdateV4, PartialUpdateWithoutRemoval)
+{
+  _PrefixArray fArray, pArray, mergedArray;
+  PrefixStringMap fMap, pMap, mergedMap;
+
+  {
+    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
+    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    nsTArray<uint32_t> empty;
+
+    CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    // Calculate the expected prefix map.
+    mergedArray.AppendElements(fArray);
+    mergedArray.AppendElements(pArray);
+    mergedArray.Sort();
+    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+
+    testPartialUpdate(pMap, empty, mergedMap);
+  }
+
+  Clear();
+}
+
+// Expect failure because partial update contains prefix already
+// in old prefix set.
+TEST(UrlClassifierTableUpdateV4, PartialUpdatePrefixAlreadyExist)
+{
+  _PrefixArray fArray, pArray;
+  PrefixStringMap fMap, pMap;
+
+  {
+    CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    nsTArray<uint32_t> empty;
+    nsTArray<TableUpdate*> tableUpdates;
+
+    // Pick one prefix from full update prefix and add it to partial update.
+    // This should result a failure when call ApplyUpdates.
+    pArray.AppendElement(fArray[rand() % fArray.Length()]);
+    CreateRandomSortedPrefixArray(200, 4, 32, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    GenerateUpdateData(false, pMap, empty, tableUpdates);
+    testUpdateFail(tableUpdates);
+  }
+
+  Clear();
+}
+
+// Test apply partial update directly without applying an full update first.
+TEST(UrlClassifierTableUpdateV4, OnlyPartialUpdate)
+{
+  _PrefixArray pArray;
+  PrefixStringMap pMap;
+  nsTArray<uint32_t> empty;
+
+  CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
+  CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+  PrefixArrayToPrefixStringMap(pArray, pMap);
+
+  testPartialUpdate(pMap, empty, pMap);
+
+  Clear();
+}
+
+// Test partial update without any ADD prefixes, only removalIndices.
+TEST(UrlClassifierTableUpdateV4, PartialUpdateOnlyRemoval)
+{
+  _PrefixArray fArray, pArray;
+  PrefixStringMap fMap, pMap, mergedMap;
+
+  {
+    CreateRandomSortedPrefixArray(5000, 4, 4, fArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    // Remove 1/5 of elements of original prefix set.
+    nsTArray<uint32_t> removal;
+    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+    RemoveElements(removal, fArray);
+
+    PrefixArrayToPrefixStringMap(fArray, mergedMap);
+
+    testPartialUpdate(pMap, removal, mergedMap);
+  }
+
+  Clear();
+}
+
+// Test one tableupdate array contains full update and multiple partial updates.
+TEST(UrlClassifierTableUpdateV4, MultipleTableUpdates)
+{
+  _PrefixArray fArray, pArray, mergedArray;
+  PrefixStringMap fMap, pMap, mergedMap;
+
+  {
+    nsTArray<uint32_t> empty;
+    nsTArray<TableUpdate*> tableUpdates;
+
+    // Generate first full udpate
+    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
+    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    GenerateUpdateData(true, fMap, empty, tableUpdates);
+
+    // Generate second partial update
+    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    GenerateUpdateData(false, pMap, empty, tableUpdates);
+
+    // Generate thrid partial update
+    fArray.AppendElements(pArray);
+    fArray.Sort();
+    pArray.Clear();
+    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    // Remove 1/5 of elements of original prefix set.
+    nsTArray<uint32_t> removal;
+    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+    RemoveElements(removal, fArray);
+
+    GenerateUpdateData(false, pMap, removal, tableUpdates);
+
+    mergedArray.AppendElements(fArray);
+    mergedArray.AppendElements(pArray);
+    mergedArray.Sort();
+    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+
+    testUpdate(tableUpdates, mergedMap);
+  }
+
+  Clear();
+}
+
+// Test apply full update first, and then apply multiple partial updates
+// in one tableupdate array.
+TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
+{
+  _PrefixArray fArray, pArray, mergedArray;
+  PrefixStringMap fMap, pMap, mergedMap;
+
+  {
+    // Generate first full udpate
+    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
+    CreateRandomSortedPrefixArray(3000, 5, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    nsTArray<uint32_t> removal;
+    nsTArray<TableUpdate*> tableUpdates;
+
+    // Generate first partial update
+    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    // Remove 1/5 of elements of original prefix set.
+    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+    RemoveElements(removal, fArray);
+
+    GenerateUpdateData(false, pMap, removal, tableUpdates);
+
+    fArray.AppendElements(pArray);
+    fArray.Sort();
+    pArray.Clear();
+    removal.Clear();
+
+    // Generate second partial update.
+    CreateRandomSortedPrefixArray(2000, 4, 4, pArray);
+    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    // Remove 1/5 of elements of original prefix set.
+    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+    RemoveElements(removal, fArray);
+
+    GenerateUpdateData(false, pMap, removal, tableUpdates);
+
+    mergedArray.AppendElements(fArray);
+    mergedArray.AppendElements(pArray);
+    mergedArray.Sort();
+    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+
+    testUpdate(tableUpdates, mergedMap);
+  }
+
+  Clear();
+}
+
+// Test removal indices are larger than the original prefix set.
+TEST(UrlClassifierTableUpdateV4, RemovalIndexTooLarge)
+{
+  _PrefixArray fArray, pArray;
+  PrefixStringMap fMap, pMap;
+
+  {
+    CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
+    PrefixArrayToPrefixStringMap(fArray, fMap);
+
+    testFullUpdate(fMap);
+  }
+
+  {
+    nsTArray<uint32_t> removal;
+    nsTArray<TableUpdate*> tableUpdates;
+
+    CreateRandomSortedPrefixArray(200, 4, 32, pArray);
+    RemoveIntersection(fArray, pArray);
+    PrefixArrayToPrefixStringMap(pArray, pMap);
+
+    for (uint32_t i = 0; i < fArray.Length() + 1 ;i++) {
+      removal.AppendElement(i);
+    }
+
+    GenerateUpdateData(false, pMap, removal, tableUpdates);
+    testUpdateFail(tableUpdates);
+  }
+
+  Clear();
+}

From 35869db574c20a4786bb033d2f91672b9ef8591d Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 3 Oct 2016 22:14:49 -0700
Subject: [PATCH 51/57] Backed out 5 changesets (bug 1305801) for ASan gtest
 bustage

Backed out changeset 0c95d5dec6d9 (bug 1305801)
Backed out changeset bca0e706dbc5 (bug 1305801)
Backed out changeset def8da367beb (bug 1305801)
Backed out changeset 56ceae52d847 (bug 1305801)
Backed out changeset 14457cc4c325 (bug 1305801)
---
 toolkit/components/telemetry/Histograms.json  |  26 -
 .../components/url-classifier/Classifier.cpp  | 127 +---
 .../components/url-classifier/Classifier.h    |   3 -
 toolkit/components/url-classifier/Entries.h   |   3 -
 .../components/url-classifier/HashStore.cpp   |   2 +-
 toolkit/components/url-classifier/HashStore.h |  14 +-
 .../components/url-classifier/LookupCache.cpp | 349 +++++------
 .../components/url-classifier/LookupCache.h   |  99 +---
 .../url-classifier/LookupCacheV4.cpp          | 299 ----------
 .../components/url-classifier/LookupCacheV4.h |  61 --
 .../url-classifier/ProtocolParser.cpp         |   2 -
 .../VariableLengthPrefixSet.cpp               | 443 --------------
 .../url-classifier/VariableLengthPrefixSet.h  |  70 ---
 toolkit/components/url-classifier/moz.build   |   4 -
 .../nsUrlClassifierPrefixSet.cpp              |  88 +--
 .../url-classifier/nsUrlClassifierPrefixSet.h |  15 -
 .../tests/gtest/TestPerProviderDirectory.cpp  |   7 +-
 .../gtest/TestUrlClassifierTableUpdateV4.cpp  | 549 -----------------
 .../gtest/TestVariableLengthPrefixSet.cpp     | 559 ------------------
 .../url-classifier/tests/gtest/moz.build      |   2 -
 20 files changed, 240 insertions(+), 2482 deletions(-)
 delete mode 100644 toolkit/components/url-classifier/LookupCacheV4.cpp
 delete mode 100644 toolkit/components/url-classifier/LookupCacheV4.h
 delete mode 100644 toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
 delete mode 100644 toolkit/components/url-classifier/VariableLengthPrefixSet.h
 delete mode 100644 toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
 delete mode 100644 toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 4c7947f863d9..5a5c48de0333 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3764,24 +3764,6 @@
     "n_buckets": 15,
     "description": "Time spent constructing PrefixSet from DB (ms)"
   },
-  "URLCLASSIFIER_VLPS_FILELOAD_TIME": {
-    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
-    "expires_in_version": "58",
-    "kind": "exponential",
-    "high": 1000,
-    "n_buckets": 10,
-    "bug_numbers": [1283007],
-    "description": "Time spent loading Variable-Length PrefixSet from file (ms)"
-  },
-  "URLCLASSIFIER_VLPS_FALLOCATE_TIME": {
-    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
-    "expires_in_version": "58",
-    "kind": "exponential",
-    "high": 1000,
-    "n_buckets": 10,
-    "bug_numbers": [1283007],
-    "description": "Time spent fallocating Variable-Length PrefixSet (ms)"
-  },
   "URLCLASSIFIER_LC_PREFIXES": {
     "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
     "expires_in_version": "never",
@@ -3821,14 +3803,6 @@
     "bug_numbers": [1172688],
     "description": "This metric is recorded every time a gethash lookup is performed, `true` is recorded if the lookup times out."
   },
-  "URLCLASSIFIER_UPDATE_ERROR_TYPE": {
-    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
-    "expires_in_version": "58",
-    "kind": "enumerated",
-    "n_values": 10,
-    "bug_numbers": [1305801],
-    "description": "An error was encountered while parsing a partial update returned by a Safe Browsing V4 server (0 = addition of an already existing prefix, 1 = parser got into an infinite loop, 2 = removal index out of bounds)"
-  },
   "CSP_DOCUMENTS_COUNT": {
     "alert_emails": ["seceng@mozilla.com"],
     "bug_numbers": [1252829],
diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp
index efbc8ef570e6..99d52c4f074a 100644
--- a/toolkit/components/url-classifier/Classifier.cpp
+++ b/toolkit/components/url-classifier/Classifier.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Classifier.h"
-#include "LookupCacheV4.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsISimpleEnumerator.h"
@@ -518,6 +517,17 @@ Classifier::ApplyUpdates(nsTArray<TableUpdate*>* aUpdates)
   {
     ScopedUpdatesClearer scopedUpdatesClearer(aUpdates);
 
+    // In order to prevent any premature update code from being
+    // run against V4 updates, we bail out as early as possible
+    // if aUpdates is using V4.
+    for (auto update : *aUpdates) {
+      if (update && TableUpdate::Cast<TableUpdateV4>(update)) {
+        LOG(("V4 update is not supported yet."));
+        // TODO: Bug 1283009 - Supports applying table udpate V4.
+        return NS_ERROR_NOT_IMPLEMENTED;
+      }
+    }
+
     LOG(("Backup before update."));
 
     rv = BackupTables();
@@ -530,13 +540,7 @@ Classifier::ApplyUpdates(nsTArray<TableUpdate*>* aUpdates)
       if ((*aUpdates)[i]) {
         // Run all updates for one table
         nsCString updateTable(aUpdates->ElementAt(i)->TableName());
-
-        if (TableUpdate::Cast<TableUpdateV2>((*aUpdates)[i])) {
-          rv = UpdateHashStore(aUpdates, updateTable);
-        } else {
-          rv = UpdateTableV4(aUpdates, updateTable);
-        }
-
+        rv = UpdateHashStore(aUpdates, updateTable);
         if (NS_FAILED(rv)) {
           if (rv != NS_ERROR_OUT_OF_MEMORY) {
             Reset();
@@ -853,8 +857,7 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Read the part of the store that is (only) in the cache
-  LookupCacheV2* lookupCache =
-    LookupCache::Cast<LookupCacheV2>(GetLookupCache(store.TableName()));
+  LookupCache *lookupCache = GetLookupCache(store.TableName());
   if (!lookupCache) {
     return NS_ERROR_FAILURE;
   }
@@ -919,7 +922,7 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   NS_ENSURE_SUCCESS(rv, rv);
 
 #if defined(DEBUG)
-  lookupCache->DumpCompletions();
+  lookupCache->Dump();
 #endif
   rv = lookupCache->WriteFile();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -931,90 +934,6 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
   return NS_OK;
 }
 
-nsresult
-Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
-                          const nsACString& aTable)
-{
-  LOG(("Classifier::UpdateTableV4(%s)", PromiseFlatCString(aTable).get()));
-
-  if (!CheckValidUpdate(aUpdates, aTable)) {
-    return NS_OK;
-  }
-
-  LookupCacheV4* lookupCache =
-    LookupCache::Cast<LookupCacheV4>(GetLookupCache(aTable));
-  if (!lookupCache) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsresult rv = NS_OK;
-
-  // prefixes2 is only used in partial update. If there are multiple
-  // updates for the same table, prefixes1 & prefixes2 will act as
-  // input and output in turn to reduce memory copy overhead.
-  PrefixStringMap prefixes1, prefixes2;
-  PrefixStringMap* output = &prefixes1;
-
-  for (uint32_t i = 0; i < aUpdates->Length(); i++) {
-    TableUpdate *update = aUpdates->ElementAt(i);
-    if (!update || !update->TableName().Equals(aTable)) {
-      continue;
-    }
-
-    auto updateV4 = TableUpdate::Cast<TableUpdateV4>(update);
-    NS_ENSURE_TRUE(updateV4, NS_ERROR_FAILURE);
-
-    if (updateV4->IsFullUpdate()) {
-      TableUpdateV4::PrefixStdStringMap& map = updateV4->Prefixes();
-
-      output->Clear();
-      for (auto iter = map.Iter(); !iter.Done(); iter.Next()) {
-        // prefixes is an nsClassHashtable object stores prefix string.
-        // It will take the ownership of the put object.
-        nsCString* prefix = new nsCString(iter.Data()->GetPrefixString());
-        output->Put(iter.Key(), prefix);
-      }
-    } else {
-      PrefixStringMap* input = nullptr;
-      // If both prefix sets are empty, this means we are doing a partial update
-      // without a prior full/partial update in the loop. In this case we should
-      // get prefixes from the lookup cache first.
-      if (prefixes1.IsEmpty() && prefixes2.IsEmpty()) {
-        lookupCache->GetPrefixes(prefixes1);
-        input = &prefixes1;
-        output = &prefixes2;
-      } else {
-        MOZ_ASSERT(prefixes1.IsEmpty() ^ prefixes2.IsEmpty());
-
-        // When there are multiple partial updates, input should always point
-        // to the non-empty prefix set(filled by previous full/partial update).
-        // output should always point to the empty prefix set.
-        input = prefixes1.IsEmpty() ? &prefixes2 : &prefixes1;
-        output = prefixes1.IsEmpty() ? &prefixes1 : &prefixes2;
-      }
-
-      rv = lookupCache->ApplyPartialUpdate(updateV4, *input, *output);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      input->Clear();
-    }
-
-    aUpdates->ElementAt(i) = nullptr;
-  }
-
-  rv = lookupCache->Build(*output);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = lookupCache->WriteFile();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  int64_t now = (PR_Now() / PR_USEC_PER_SEC);
-  LOG(("Successfully updated %s\n", PromiseFlatCString(aTable).get()));
-  mTableFreshness.Put(aTable, now);
-
-  return NS_OK;
-}
-
 nsresult
 Classifier::UpdateCache(TableUpdate* aUpdate)
 {
@@ -1026,9 +945,7 @@ Classifier::UpdateCache(TableUpdate* aUpdate)
   LOG(("Classifier::UpdateCache(%s)", table.get()));
 
   LookupCache *lookupCache = GetLookupCache(table);
-  if (!lookupCache) {
-    return NS_ERROR_FAILURE;
-  }
+  NS_ENSURE_TRUE(lookupCache, NS_ERROR_FAILURE);
 
   auto updateV2 = TableUpdate::Cast<TableUpdateV2>(aUpdate);
   lookupCache->AddCompletionsToCache(updateV2->AddCompletes());
@@ -1049,16 +966,7 @@ Classifier::GetLookupCache(const nsACString& aTable)
     }
   }
 
-  // TODO : Bug 1302600, It would be better if we have a more general non-main
-  //        thread method to convert table name to protocol version. Currently
-  //        we can only know this by checking if the table name ends with '-proto'.
-  UniquePtr<LookupCache> cache;
-  if (StringEndsWith(aTable, NS_LITERAL_CSTRING("-proto"))) {
-    cache = MakeUnique<LookupCacheV4>(aTable, mRootStoreDirectory);
-  } else {
-    cache = MakeUnique<LookupCacheV2>(aTable, mRootStoreDirectory);
-  }
-
+  UniquePtr<LookupCache> cache(new LookupCache(aTable, mRootStoreDirectory));
   nsresult rv = cache->Init();
   if (NS_FAILED(rv)) {
     return nullptr;
@@ -1080,8 +988,7 @@ Classifier::ReadNoiseEntries(const Prefix& aPrefix,
                              uint32_t aCount,
                              PrefixArray* aNoiseEntries)
 {
-  // TODO : Bug 1297962, support adding noise for v4
-  LookupCacheV2 *cache = static_cast<LookupCacheV2*>(GetLookupCache(aTableName));
+  LookupCache *cache = GetLookupCache(aTableName);
   if (!cache) {
     return NS_ERROR_FAILURE;
   }
diff --git a/toolkit/components/url-classifier/Classifier.h b/toolkit/components/url-classifier/Classifier.h
index 712d62589462..e11b8d0acbb4 100644
--- a/toolkit/components/url-classifier/Classifier.h
+++ b/toolkit/components/url-classifier/Classifier.h
@@ -115,9 +115,6 @@ private:
   nsresult UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
                            const nsACString& aTable);
 
-  nsresult UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
-                         const nsACString& aTable);
-
   nsresult UpdateCache(TableUpdate* aUpdates);
 
   LookupCache *GetLookupCache(const nsACString& aTable);
diff --git a/toolkit/components/url-classifier/Entries.h b/toolkit/components/url-classifier/Entries.h
index 969f4f739b77..14bb133f8414 100644
--- a/toolkit/components/url-classifier/Entries.h
+++ b/toolkit/components/url-classifier/Entries.h
@@ -15,7 +15,6 @@
 #include "nsICryptoHash.h"
 #include "nsNetUtil.h"
 #include "nsIOutputStream.h"
-#include "nsClassHashtable.h"
 
 #if DEBUG
 #include "plbase64.h"
@@ -314,8 +313,6 @@ WriteTArray(nsIOutputStream* aStream, nsTArray_Impl<T, Alloc>& aArray)
                         &written);
 }
 
-typedef nsClassHashtable<nsUint32HashKey, nsCString> PrefixStringMap;
-
 } // namespace safebrowsing
 } // namespace mozilla
 
diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp
index 289b1823ff80..00da5fb7b33c 100644
--- a/toolkit/components/url-classifier/HashStore.cpp
+++ b/toolkit/components/url-classifier/HashStore.cpp
@@ -168,7 +168,7 @@ TableUpdateV4::NewPrefixes(int32_t aSize, std::string& aPrefixes)
   NS_ENSURE_TRUE_VOID(aPrefixes.size() % aSize == 0);
   NS_ENSURE_TRUE_VOID(!mPrefixesMap.Get(aSize));
 
-  PrefixStdString* prefix = new PrefixStdString(aPrefixes);
+  PrefixString* prefix = new PrefixString(aPrefixes);
   mPrefixesMap.Put(aSize, prefix);
 }
 
diff --git a/toolkit/components/url-classifier/HashStore.h b/toolkit/components/url-classifier/HashStore.h
index 06c070819208..1288b8db35c4 100644
--- a/toolkit/components/url-classifier/HashStore.h
+++ b/toolkit/components/url-classifier/HashStore.h
@@ -132,13 +132,13 @@ private:
 // for addition and indices to removal. See Bug 1283009.
 class TableUpdateV4 : public TableUpdate {
 public:
-  struct PrefixStdString {
+  struct PrefixString {
   private:
     std::string mStorage;
     nsDependentCSubstring mString;
 
   public:
-    explicit PrefixStdString(std::string& aString)
+    explicit PrefixString(std::string& aString)
     {
       aString.swap(mStorage);
       mString.Rebind(mStorage.data(), mStorage.size());
@@ -147,13 +147,12 @@ public:
     const nsACString& GetPrefixString() const { return mString; };
   };
 
-  typedef nsClassHashtable<nsUint32HashKey, PrefixStdString> PrefixStdStringMap;
+  typedef nsClassHashtable<nsUint32HashKey, PrefixString> PrefixesStringMap;
   typedef nsTArray<int32_t> RemovalIndiceArray;
 
 public:
   explicit TableUpdateV4(const nsACString& aTable)
     : TableUpdate(aTable)
-    , mFullUpdate(false)
   {
   }
 
@@ -162,22 +161,19 @@ public:
     return mPrefixesMap.IsEmpty() && mRemovalIndiceArray.IsEmpty();
   }
 
-  bool IsFullUpdate() const { return mFullUpdate; }
-  PrefixStdStringMap& Prefixes() { return mPrefixesMap; }
+  PrefixesStringMap& Prefixes() { return mPrefixesMap; }
   RemovalIndiceArray& RemovalIndices() { return mRemovalIndiceArray; }
 
   // For downcasting.
   static const int TAG = 4;
 
-  void SetFullUpdate(bool aIsFullUpdate) { mFullUpdate = aIsFullUpdate; }
   void NewPrefixes(int32_t aSize, std::string& aPrefixes);
   void NewRemovalIndices(const uint32_t* aIndices, size_t aNumOfIndices);
 
 private:
   virtual int Tag() const override { return TAG; }
 
-  bool mFullUpdate;
-  PrefixStdStringMap mPrefixesMap;
+  PrefixesStringMap mPrefixesMap;
   RemovalIndiceArray mRemovalIndiceArray;
 };
 
diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp
index 328e55619cbc..98e334db1e7d 100644
--- a/toolkit/components/url-classifier/LookupCache.cpp
+++ b/toolkit/components/url-classifier/LookupCache.cpp
@@ -40,8 +40,6 @@ extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
 namespace mozilla {
 namespace safebrowsing {
 
-const int LookupCacheV2::VER = 2;
-
 LookupCache::LookupCache(const nsACString& aTableName, nsIFile* aRootStoreDir)
   : mPrimed(false)
   , mTableName(aTableName)
@@ -50,11 +48,29 @@ LookupCache::LookupCache(const nsACString& aTableName, nsIFile* aRootStoreDir)
   UpdateRootDirHandle(mRootStoreDirectory);
 }
 
+nsresult
+LookupCache::Init()
+{
+  mPrefixSet = new nsUrlClassifierPrefixSet();
+  nsresult rv = mPrefixSet->Init(mTableName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+LookupCache::~LookupCache()
+{
+}
+
 nsresult
 LookupCache::Open()
 {
+  LOG(("Reading Completions"));
+  nsresult rv = ReadCompletions();
+  NS_ENSURE_SUCCESS(rv, rv);
+
   LOG(("Loading PrefixSet"));
-  nsresult rv = LoadPrefixSet();
+  rv = LoadPrefixSet();
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -109,6 +125,32 @@ LookupCache::Reset()
   return NS_OK;
 }
 
+
+nsresult
+LookupCache::Build(AddPrefixArray& aAddPrefixes,
+                   AddCompleteArray& aAddCompletes)
+{
+  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_COMPLETIONS,
+                        static_cast<uint32_t>(aAddCompletes.Length()));
+
+  mUpdateCompletions.Clear();
+  mUpdateCompletions.SetCapacity(aAddCompletes.Length());
+  for (uint32_t i = 0; i < aAddCompletes.Length(); i++) {
+    mUpdateCompletions.AppendElement(aAddCompletes[i].CompleteHash());
+  }
+  aAddCompletes.Clear();
+  mUpdateCompletions.Sort();
+
+  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_PREFIXES,
+                        static_cast<uint32_t>(aAddPrefixes.Length()));
+
+  nsresult rv = ConstructPrefixSet(aAddPrefixes);
+  NS_ENSURE_SUCCESS(rv, rv);
+  mPrimed = true;
+
+  return NS_OK;
+}
+
 nsresult
 LookupCache::AddCompletionsToCache(AddCompleteArray& aAddCompletes)
 {
@@ -135,8 +177,50 @@ LookupCache::DumpCache()
     LOG(("Caches: %s", str.get()));
   }
 }
+
+void
+LookupCache::Dump()
+{
+  if (!LOG_ENABLED())
+    return;
+
+  for (uint32_t i = 0; i < mUpdateCompletions.Length(); i++) {
+    nsAutoCString str;
+    mUpdateCompletions[i].ToHexString(str);
+    LOG(("Update: %s", str.get()));
+  }
+}
 #endif
 
+nsresult
+LookupCache::Has(const Completion& aCompletion,
+                 bool* aHas, bool* aComplete)
+{
+  *aHas = *aComplete = false;
+
+  uint32_t prefix = aCompletion.ToUint32();
+
+  bool found;
+  nsresult rv = mPrefixSet->Contains(prefix, &found);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  LOG(("Probe in %s: %X, found %d", mTableName.get(), prefix, found));
+
+  if (found) {
+    *aHas = true;
+  }
+
+  // TODO: We may need to distinguish completions found in cache or update in the future
+  if ((mGetHashCache.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex) ||
+      (mUpdateCompletions.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex)) {
+    LOG(("Complete in %s", mTableName.get()));
+    *aComplete = true;
+    *aHas = true;
+  }
+
+  return NS_OK;
+}
+
 nsresult
 LookupCache::WriteFile()
 {
@@ -147,7 +231,7 @@ LookupCache::WriteFile()
   rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = StoreToFile(psFile);
+  rv = mPrefixSet->StoreToFile(psFile);
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "failed to store the prefixset");
 
   return NS_OK;
@@ -157,16 +241,41 @@ void
 LookupCache::ClearAll()
 {
   ClearCache();
-  ClearPrefixes();
+  ClearUpdatedCompletions();
+  mPrefixSet->SetPrefixes(nullptr, 0);
   mPrimed = false;
 }
 
+void
+LookupCache::ClearUpdatedCompletions()
+{
+  mUpdateCompletions.Clear();
+}
+
 void
 LookupCache::ClearCache()
 {
   mGetHashCache.Clear();
 }
 
+nsresult
+LookupCache::ReadCompletions()
+{
+  HashStore store(mTableName, mRootStoreDirectory);
+
+  nsresult rv = store.Open();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mUpdateCompletions.Clear();
+
+  const AddCompleteArray& addComplete = store.AddCompletes();
+  for (uint32_t i = 0; i < addComplete.Length(); i++) {
+    mUpdateCompletions.AppendElement(addComplete[i].complete);
+  }
+
+  return NS_OK;
+}
+
 /* static */ bool
 LookupCache::IsCanonicalizedIP(const nsACString& aHost)
 {
@@ -343,178 +452,9 @@ LookupCache::GetHostKeys(const nsACString& aSpec,
   return NS_OK;
 }
 
-nsresult
-LookupCache::LoadPrefixSet()
+bool LookupCache::IsPrimed()
 {
-  nsCOMPtr<nsIFile> psFile;
-  nsresult rv = mStoreDirectory->Clone(getter_AddRefs(psFile));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool exists;
-  rv = psFile->Exists(&exists);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (exists) {
-    LOG(("stored PrefixSet exists, loading from disk"));
-    rv = LoadFromFile(psFile);
-    if (NS_FAILED(rv)) {
-      if (rv == NS_ERROR_FILE_CORRUPTED) {
-        Reset();
-      }
-      return rv;
-    }
-    mPrimed = true;
-  } else {
-    LOG(("no (usable) stored PrefixSet found"));
-  }
-
-#ifdef DEBUG
-  if (mPrimed) {
-    uint32_t size = SizeOfPrefixSet();
-    LOG(("SB tree done, size = %d bytes\n", size));
-  }
-#endif
-
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV2::Init()
-{
-  mPrefixSet = new nsUrlClassifierPrefixSet();
-  nsresult rv = mPrefixSet->Init(mTableName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV2::Open()
-{
-  nsresult rv = LookupCache::Open();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  LOG(("Reading Completions"));
-  rv = ReadCompletions();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-void
-LookupCacheV2::ClearAll()
-{
-  LookupCache::ClearAll();
-  mUpdateCompletions.Clear();
-}
-
-nsresult
-LookupCacheV2::Has(const Completion& aCompletion,
-                   bool* aHas, bool* aComplete)
-{
-  *aHas = *aComplete = false;
-
-  uint32_t prefix = aCompletion.ToUint32();
-
-  bool found;
-  nsresult rv = mPrefixSet->Contains(prefix, &found);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  LOG(("Probe in %s: %X, found %d", mTableName.get(), prefix, found));
-
-  if (found) {
-    *aHas = true;
-  }
-
-  if ((mGetHashCache.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex) ||
-      (mUpdateCompletions.BinaryIndexOf(aCompletion) != nsTArray<Completion>::NoIndex)) {
-    LOG(("Complete in %s", mTableName.get()));
-    *aComplete = true;
-    *aHas = true;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV2::Build(AddPrefixArray& aAddPrefixes,
-                     AddCompleteArray& aAddCompletes)
-{
-  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_COMPLETIONS,
-                        static_cast<uint32_t>(aAddCompletes.Length()));
-
-  mUpdateCompletions.Clear();
-  mUpdateCompletions.SetCapacity(aAddCompletes.Length());
-  for (uint32_t i = 0; i < aAddCompletes.Length(); i++) {
-    mUpdateCompletions.AppendElement(aAddCompletes[i].CompleteHash());
-  }
-  aAddCompletes.Clear();
-  mUpdateCompletions.Sort();
-
-  Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LC_PREFIXES,
-                        static_cast<uint32_t>(aAddPrefixes.Length()));
-
-  nsresult rv = ConstructPrefixSet(aAddPrefixes);
-  NS_ENSURE_SUCCESS(rv, rv);
-  mPrimed = true;
-
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV2::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
-{
-  if (!mPrimed) {
-    // This can happen if its a new table, so no error.
-    LOG(("GetPrefixes from empty LookupCache"));
-    return NS_OK;
-  }
-  return mPrefixSet->GetPrefixesNative(aAddPrefixes);
-}
-
-nsresult
-LookupCacheV2::ReadCompletions()
-{
-  HashStore store(mTableName, mRootStoreDirectory);
-
-  nsresult rv = store.Open();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mUpdateCompletions.Clear();
-
-  const AddCompleteArray& addComplete = store.AddCompletes();
-  for (uint32_t i = 0; i < addComplete.Length(); i++) {
-    mUpdateCompletions.AppendElement(addComplete[i].complete);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV2::ClearPrefixes()
-{
-  return mPrefixSet->SetPrefixes(nullptr, 0);
-}
-
-nsresult
-LookupCacheV2::StoreToFile(nsIFile* aFile)
-{
-  return mPrefixSet->StoreToFile(aFile);
-}
-
-nsresult
-LookupCacheV2::LoadFromFile(nsIFile* aFile)
-{
-  return mPrefixSet->LoadFromFile(aFile);
-}
-
-size_t
-LookupCacheV2::SizeOfPrefixSet()
-{
-  return mPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
+  return mPrimed;
 }
 
 #ifdef DEBUG
@@ -538,7 +478,7 @@ static void EnsureSorted(T* aArray)
 #endif
 
 nsresult
-LookupCacheV2::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
+LookupCache::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
 {
   Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_CONSTRUCT_TIME> timer;
 
@@ -572,20 +512,55 @@ LookupCacheV2::ConstructPrefixSet(AddPrefixArray& aAddPrefixes)
   return NS_OK;
 }
 
-#if defined(DEBUG)
-void
-LookupCacheV2::DumpCompletions()
+nsresult
+LookupCache::LoadPrefixSet()
 {
-  if (!LOG_ENABLED())
-    return;
+  nsCOMPtr<nsIFile> psFile;
+  nsresult rv = mStoreDirectory->Clone(getter_AddRefs(psFile));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  for (uint32_t i = 0; i < mUpdateCompletions.Length(); i++) {
-    nsAutoCString str;
-    mUpdateCompletions[i].ToHexString(str);
-    LOG(("Update: %s", str.get()));
+  rv = psFile->AppendNative(mTableName + NS_LITERAL_CSTRING(PREFIXSET_SUFFIX));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool exists;
+  rv = psFile->Exists(&exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (exists) {
+    LOG(("stored PrefixSet exists, loading from disk"));
+    rv = mPrefixSet->LoadFromFile(psFile);
+    if (NS_FAILED(rv)) {
+      if (rv == NS_ERROR_FILE_CORRUPTED) {
+        Reset();
+      }
+      return rv;
+    }
+    mPrimed = true;
+  } else {
+    LOG(("no (usable) stored PrefixSet found"));
+  }
+
+#ifdef DEBUG
+  if (mPrimed) {
+    uint32_t size = mPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
+    LOG(("SB tree done, size = %d bytes\n", size));
   }
-}
 #endif
 
+  return NS_OK;
+}
+
+nsresult
+LookupCache::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
+{
+  if (!mPrimed) {
+    // This can happen if its a new table, so no error.
+    LOG(("GetPrefixes from empty LookupCache"));
+    return NS_OK;
+  }
+  return mPrefixSet->GetPrefixesNative(aAddPrefixes);
+}
+
+
 } // namespace safebrowsing
 } // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h
index 9bc96624197a..6b64c8bae486 100644
--- a/toolkit/components/url-classifier/LookupCache.h
+++ b/toolkit/components/url-classifier/LookupCache.h
@@ -14,7 +14,6 @@
 #include "nsIFileStreams.h"
 #include "mozilla/RefPtr.h"
 #include "nsUrlClassifierPrefixSet.h"
-#include "VariableLengthPrefixSet.h"
 #include "mozilla/Logging.h"
 
 namespace mozilla {
@@ -97,58 +96,50 @@ public:
                               nsTArray<nsCString>* aHostKeys);
 
   LookupCache(const nsACString& aTableName, nsIFile* aStoreFile);
-  virtual ~LookupCache() {}
+  ~LookupCache();
 
   const nsCString &TableName() const { return mTableName; }
 
+  nsresult Init();
+  nsresult Open();
   // The directory handle where we operate will
   // be moved away when a backup is made.
   nsresult UpdateRootDirHandle(nsIFile* aRootStoreDirectory);
-
   // This will Clear() the passed arrays when done.
+  nsresult Build(AddPrefixArray& aAddPrefixes,
+                 AddCompleteArray& aAddCompletes);
   nsresult AddCompletionsToCache(AddCompleteArray& aAddCompletes);
-
-  // Write data stored in lookup cache to disk.
-  nsresult WriteFile();
-
-  // Clear completions retrieved from gethash request.
+  nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
+  void ClearUpdatedCompletions();
   void ClearCache();
 
-  bool IsPrimed() const { return mPrimed; };
-
 #if DEBUG
   void DumpCache();
+  void Dump();
 #endif
-
-  virtual nsresult Open();
-  virtual nsresult Init() = 0;
-  virtual nsresult ClearPrefixes() = 0;
-  virtual nsresult Has(const Completion& aCompletion,
-                       bool* aHas, bool* aComplete) = 0;
-
-  template<typename T>
-  static T* Cast(LookupCache* aThat) {
-    return (T::VER == aThat->Ver() ? reinterpret_cast<T*>(aThat) : nullptr);
-  }
+  nsresult WriteFile();
+  nsresult Has(const Completion& aCompletion,
+               bool* aHas, bool* aComplete);
+  bool IsPrimed();
 
 private:
+  void ClearAll();
   nsresult Reset();
+  nsresult ReadCompletions();
   nsresult LoadPrefixSet();
-
-  virtual nsresult StoreToFile(nsIFile* aFile) = 0;
-  virtual nsresult LoadFromFile(nsIFile* aFile) = 0;
-  virtual size_t SizeOfPrefixSet() = 0;
-
-  virtual int Ver() const = 0;
-
-protected:
-  virtual void ClearAll();
+  nsresult LoadCompletions();
+  // Construct a Prefix Set with known prefixes.
+  // This will Clear() aAddPrefixes when done.
+  nsresult ConstructPrefixSet(AddPrefixArray& aAddPrefixes);
 
   bool mPrimed;
   nsCString mTableName;
   nsCOMPtr<nsIFile> mRootStoreDirectory;
   nsCOMPtr<nsIFile> mStoreDirectory;
-
+  // Set of prefixes known to be in the database
+  RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
+  // Full length hashes obtained in update request
+  CompletionArray mUpdateCompletions;
   // Full length hashes obtained in gethash request
   CompletionArray mGetHashCache;
 
@@ -156,52 +147,6 @@ protected:
   friend class PerProviderDirectoryTestUtils;
 };
 
-class LookupCacheV2 final : public LookupCache
-{
-public:
-  explicit LookupCacheV2(const nsACString& aTableName, nsIFile* aStoreFile)
-    : LookupCache(aTableName, aStoreFile) {}
-  ~LookupCacheV2() {}
-
-  virtual nsresult Init() override;
-  virtual nsresult Open() override;
-  virtual void ClearAll() override;
-  virtual nsresult Has(const Completion& aCompletion,
-                       bool* aHas, bool* aComplete) override;
-
-  nsresult Build(AddPrefixArray& aAddPrefixes,
-                 AddCompleteArray& aAddCompletes);
-
-  nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
-
-#if DEBUG
-  void DumpCompletions();
-#endif
-
-  static const int VER;
-
-protected:
-  nsresult ReadCompletions();
-
-  virtual nsresult ClearPrefixes() override;
-  virtual nsresult StoreToFile(nsIFile* aFile) override;
-  virtual nsresult LoadFromFile(nsIFile* aFile) override;
-  virtual size_t SizeOfPrefixSet() override;
-
-private:
-  virtual int Ver() const override { return VER; }
-
-  // Construct a Prefix Set with known prefixes.
-  // This will Clear() aAddPrefixes when done.
-  nsresult ConstructPrefixSet(AddPrefixArray& aAddPrefixes);
-
-  // Full length hashes obtained in update request
-  CompletionArray mUpdateCompletions;
-
-  // Set of prefixes known to be in the database
-  RefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
-};
-
 } // namespace safebrowsing
 } // namespace mozilla
 
diff --git a/toolkit/components/url-classifier/LookupCacheV4.cpp b/toolkit/components/url-classifier/LookupCacheV4.cpp
deleted file mode 100644
index 8560d02aae1f..000000000000
--- a/toolkit/components/url-classifier/LookupCacheV4.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#include "LookupCacheV4.h"
-#include "HashStore.h"
-
-// MOZ_LOG=UrlClassifierDbService:5
-extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
-#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args)
-#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug)
-
-namespace mozilla {
-namespace safebrowsing {
-
-const int LookupCacheV4::VER = 4;
-
-// Prefixes coming from updates and VLPrefixSet are both stored in the HashTable
-// where the (key, value) pair is a prefix size and a lexicographic-sorted string.
-// The difference is prefixes from updates use std:string(to avoid additional copies)
-// and prefixes from VLPrefixSet use nsCString.
-// This class provides a common interface for the partial update algorithm to make it
-// easier to operate on two different kind prefix string map..
-class VLPrefixSet
-{
-public:
-  explicit VLPrefixSet(const PrefixStringMap& aMap);
-  explicit VLPrefixSet(const TableUpdateV4::PrefixStdStringMap& aMap);
-
-  // This function will merge the prefix map in VLPrefixSet to aPrefixMap.
-  void Merge(PrefixStringMap& aPrefixMap);
-
-  // Find the smallest string from the map in VLPrefixSet.
-  bool GetSmallestPrefix(nsDependentCSubstring& aOutString);
-
-  // Return the number of prefixes in the map
-  uint32_t Count() const { return mCount; }
-
-private:
-  // PrefixString structure contains a lexicographic-sorted string with
-  // a |pos| variable to indicate which substring we are pointing to right now.
-  // |pos| increases each time GetSmallestPrefix finds the smallest string.
-  struct PrefixString {
-    PrefixString(const nsACString& aStr, uint32_t aSize)
-     : pos(0)
-     , size(aSize)
-    {
-      data.Rebind(aStr.BeginReading(), aStr.Length());
-    }
-
-    const char* get() {
-      return pos < data.Length() ? data.BeginReading() + pos : nullptr;
-    }
-    void next() { pos += size; }
-    uint32_t remaining() { return data.Length() - pos; }
-
-    nsDependentCSubstring data;
-    uint32_t pos;
-    uint32_t size;
-  };
-
-  nsClassHashtable<nsUint32HashKey, PrefixString> mMap;
-  uint32_t mCount;
-};
-
-nsresult
-LookupCacheV4::Init()
-{
-  mVLPrefixSet = new VariableLengthPrefixSet();
-  nsresult rv = mVLPrefixSet->Init(mTableName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-// TODO : Bug 1298257, Implement url matching for variable-length prefix set
-nsresult
-LookupCacheV4::Has(const Completion& aCompletion,
-                   bool* aHas, bool* aComplete)
-{
-  *aHas = false;
-  return NS_OK;
-}
-
-nsresult
-LookupCacheV4::Build(PrefixStringMap& aPrefixMap)
-{
-  return mVLPrefixSet->SetPrefixes(aPrefixMap);
-}
-
-nsresult
-LookupCacheV4::GetPrefixes(PrefixStringMap& aPrefixMap)
-{
-  return mVLPrefixSet->GetPrefixes(aPrefixMap);
-}
-
-nsresult
-LookupCacheV4::ClearPrefixes()
-{
-  // Clear by seting a empty map
-  PrefixStringMap map;
-  return mVLPrefixSet->SetPrefixes(map);
-}
-
-nsresult
-LookupCacheV4::StoreToFile(nsIFile* aFile)
-{
-  return mVLPrefixSet->StoreToFile(aFile);
-}
-
-nsresult
-LookupCacheV4::LoadFromFile(nsIFile* aFile)
-{
-  return mVLPrefixSet->LoadFromFile(aFile);
-}
-
-size_t
-LookupCacheV4::SizeOfPrefixSet()
-{
-  return mVLPrefixSet->SizeOfIncludingThis(moz_malloc_size_of);
-}
-
-static void
-AppendPrefixToMap(PrefixStringMap& prefixes, nsDependentCSubstring& prefix)
-{
-  if (!prefix.Length()) {
-    return;
-  }
-
-  nsCString* prefixString = prefixes.LookupOrAdd(prefix.Length());
-  prefixString->Append(prefix.BeginReading(), prefix.Length());
-}
-
-// Please see https://bug1287058.bmoattachments.org/attachment.cgi?id=8795366
-// for detail about partial update algorithm.
-nsresult
-LookupCacheV4::ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
-                                  PrefixStringMap& aInputMap,
-                                  PrefixStringMap& aOutputMap)
-{
-  MOZ_ASSERT(aOutputMap.IsEmpty());
-
-  // oldPSet contains prefixes we already have or we just merged last round.
-  // addPSet contains prefixes stored in tableUpdate which should be merged with oldPSet.
-  VLPrefixSet oldPSet(aInputMap);
-  VLPrefixSet addPSet(aTableUpdate->Prefixes());
-
-  // RemovalIndiceArray is a sorted integer array indicating the index of prefix we should
-  // remove from the old prefix set(according to lexigraphic order).
-  // |removalIndex| is the current index of RemovalIndiceArray.
-  // |numOldPrefixPicked| is used to record how many prefixes we picked from the old map.
-  TableUpdateV4::RemovalIndiceArray& removalArray = aTableUpdate->RemovalIndices();
-  uint32_t removalIndex = 0;
-  int32_t numOldPrefixPicked = -1;
-
-  nsDependentCSubstring smallestOldPrefix;
-  nsDependentCSubstring smallestAddPrefix;
-
-  // This is used to avoid infinite loop for partial update algorithm.
-  // The maximum loops will be the number of old prefixes plus the number of add prefixes.
-  uint32_t index = oldPSet.Count() + addPSet.Count() + 1;
-  for(;index > 0; index--) {
-    // Get smallest prefix from the old prefix set if we don't have one
-    if (smallestOldPrefix.IsEmpty()) {
-      // If prefixes from the old prefix set are all merged,
-      // then we can merge the entire add prefix set directly.
-      if (!oldPSet.GetSmallestPrefix(smallestOldPrefix)) {
-        AppendPrefixToMap(aOutputMap, smallestAddPrefix);
-        addPSet.Merge(aOutputMap);
-        break;
-      }
-    }
-
-    // Get smallest prefix from add prefix set if we don't have one
-    if (smallestAddPrefix.IsEmpty()) {
-      // If add prefixes are all merged and there is no removalIndices left,
-      // then merge the entire old prefix set directly. If there are still
-      // removalIndices left, we should still merge prefixes one by one
-      // to know which prefix from old prefix set should be removed.
-      if (!addPSet.GetSmallestPrefix(smallestAddPrefix) &&
-        removalIndex >= removalArray.Length()) {
-        AppendPrefixToMap(aOutputMap, smallestOldPrefix);
-        oldPSet.Merge(aOutputMap);
-        break;
-      }
-    }
-
-    // Compare the smallest string in old prefix set and add prefix set, merge the
-    // smaller one into new map to ensure merged string still follows
-    // lexigraphic order.
-    if (smallestOldPrefix < smallestAddPrefix ||
-        smallestAddPrefix.IsEmpty()) {
-      numOldPrefixPicked++;
-
-      // If the number of picks from old map matches the removalIndex, then this prefix
-      // will be removed by not merging it to new map.
-      if (removalIndex < removalArray.Length() &&
-          numOldPrefixPicked == removalArray[removalIndex]) {
-        removalIndex++;
-      } else {
-        AppendPrefixToMap(aOutputMap, smallestOldPrefix);
-      }
-      smallestOldPrefix.SetLength(0);
-    } else if (smallestOldPrefix > smallestAddPrefix ||
-               smallestOldPrefix.IsEmpty()){
-      AppendPrefixToMap(aOutputMap, smallestAddPrefix);
-      smallestAddPrefix.SetLength(0);
-    } else {
-      NS_WARNING("Add prefix should not exist in the original prefix set.");
-      Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
-                            DUPLICATE_PREFIX);
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  // We expect index will be greater to 0 because max number of runs will be
-  // the number of original prefix plus add prefix.
-  if (index <= 0) {
-    NS_WARNING("There are still prefixes remaining after reaching maximum runs.");
-    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
-                          INFINITE_LOOP);
-    return NS_ERROR_FAILURE;
-  }
-
-  if (removalIndex < removalArray.Length()) {
-    NS_WARNING("There are still prefixes to remove after exhausting the old PrefixSet.");
-    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
-                          WRONG_REMOVAL_INDICES);
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-VLPrefixSet::VLPrefixSet(const PrefixStringMap& aMap)
-  : mCount(0)
-{
-  for (auto iter = aMap.ConstIter(); !iter.Done(); iter.Next()) {
-    uint32_t size = iter.Key();
-    mMap.Put(size, new PrefixString(*iter.Data(), size));
-    mCount += iter.Data()->Length() / size;
-  }
-}
-
-VLPrefixSet::VLPrefixSet(const TableUpdateV4::PrefixStdStringMap& aMap)
-  : mCount(0)
-{
-  for (auto iter = aMap.ConstIter(); !iter.Done(); iter.Next()) {
-    uint32_t size = iter.Key();
-    mMap.Put(size, new PrefixString(iter.Data()->GetPrefixString(), size));
-    mCount += iter.Data()->GetPrefixString().Length() / size;
-  }
-}
-
-void
-VLPrefixSet::Merge(PrefixStringMap& aPrefixMap) {
-  for (auto iter = mMap.ConstIter(); !iter.Done(); iter.Next()) {
-    nsCString* prefixString = aPrefixMap.LookupOrAdd(iter.Key());
-    PrefixString* str = iter.Data();
-
-    if (str->get()) {
-      prefixString->Append(str->get(), str->remaining());
-    }
-  }
-}
-
-bool
-VLPrefixSet::GetSmallestPrefix(nsDependentCSubstring& aOutString) {
-  PrefixString* pick = nullptr;
-  for (auto iter = mMap.ConstIter(); !iter.Done(); iter.Next()) {
-    PrefixString* str = iter.Data();
-
-    if (!str->get()) {
-      continue;
-    }
-
-    if (aOutString.IsEmpty()) {
-      aOutString.Rebind(str->get(), iter.Key());
-      pick = str;
-      continue;
-    }
-
-    nsDependentCSubstring cur(str->get(), iter.Key());
-    if (cur < aOutString) {
-      aOutString.Rebind(str->get(), iter.Key());
-      pick = str;
-    }
-  }
-
-  if (pick) {
-    pick->next();
-  }
-
-  return pick != nullptr;
-}
-
-} // namespace safebrowsing
-} // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCacheV4.h b/toolkit/components/url-classifier/LookupCacheV4.h
deleted file mode 100644
index 960a8d652315..000000000000
--- a/toolkit/components/url-classifier/LookupCacheV4.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef LookupCacheV4_h__
-#define LookupCacheV4_h__
-
-#include "LookupCache.h"
-
-namespace mozilla {
-namespace safebrowsing {
-
-// Forward declaration.
-class TableUpdateV4;
-
-class LookupCacheV4 final : public LookupCache
-{
-public:
-  explicit LookupCacheV4(const nsACString& aTableName, nsIFile* aStoreFile)
-    : LookupCache(aTableName, aStoreFile) {}
-  ~LookupCacheV4() {}
-
-  virtual nsresult Init() override;
-  virtual nsresult Has(const Completion& aCompletion,
-                       bool* aHas, bool* aComplete) override;
-
-  nsresult Build(PrefixStringMap& aPrefixMap);
-
-  nsresult GetPrefixes(PrefixStringMap& aPrefixMap);
-
-  // ApplyPartialUpdate will merge partial update data stored in aTableUpdate
-  // with prefixes in aInputMap.
-  nsresult ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
-                              PrefixStringMap& aInputMap,
-                              PrefixStringMap& aOutputMap);
-
-  static const int VER;
-
-protected:
-  virtual nsresult ClearPrefixes() override;
-  virtual nsresult StoreToFile(nsIFile* aFile) override;
-  virtual nsresult LoadFromFile(nsIFile* aFile) override;
-  virtual size_t SizeOfPrefixSet() override;
-
-private:
-  virtual int Ver() const override { return VER; }
-
-  enum UPDATE_ERROR_TYPES {
-    DUPLICATE_PREFIX = 0,
-    INFINITE_LOOP = 1,
-    WRONG_REMOVAL_INDICES = 2,
-  };
-
-  RefPtr<VariableLengthPrefixSet> mVLPrefixSet;
-};
-
-} // namespace safebrowsing
-} // namespace mozilla
-
-#endif
diff --git a/toolkit/components/url-classifier/ProtocolParser.cpp b/toolkit/components/url-classifier/ProtocolParser.cpp
index 0f83aa23f461..38dfea96da3d 100644
--- a/toolkit/components/url-classifier/ProtocolParser.cpp
+++ b/toolkit/components/url-classifier/ProtocolParser.cpp
@@ -873,8 +873,6 @@ ProtocolParserProtobuf::ProcessOneResponse(const ListUpdateResponse& aResponse)
   PARSER_LOG(("* listName: %s\n", listName.get()));
   PARSER_LOG(("* newState: %s\n", aResponse.new_client_state().c_str()));
   PARSER_LOG(("* isFullUpdate: %s\n", (isFullUpdate ? "yes" : "no")));
-
-  tuV4->SetFullUpdate(isFullUpdate);
   ProcessAdditionOrRemoval(*tuV4, aResponse.additions(), true /*aIsAddition*/);
   ProcessAdditionOrRemoval(*tuV4, aResponse.removals(), false);
   PARSER_LOG(("\n\n"));
diff --git a/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp b/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
deleted file mode 100644
index 5b6a7b0a3fa3..000000000000
--- a/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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/. */
-
-#include "VariableLengthPrefixSet.h"
-#include "nsUrlClassifierPrefixSet.h"
-#include "nsPrintfCString.h"
-#include "nsThreadUtils.h"
-#include "mozilla/EndianUtils.h"
-#include "mozilla/Telemetry.h"
-#include "mozilla/Unused.h"
-#include <algorithm>
-
-// MOZ_LOG=UrlClassifierPrefixSet:5
-static mozilla::LazyLogModule gUrlClassifierPrefixSetLog("UrlClassifierPrefixSet");
-#define LOG(args) MOZ_LOG(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug, args)
-#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug)
-
-namespace mozilla {
-namespace safebrowsing {
-
-#define PREFIX_SIZE_FIXED 4
-
-NS_IMPL_ISUPPORTS(VariableLengthPrefixSet, nsIMemoryReporter)
-
-// Definition required due to std::max<>()
-const uint32_t VariableLengthPrefixSet::MAX_BUFFER_SIZE;
-
-// This class will process prefix size between 4~32. But for 4 bytes prefixes,
-// they will be passed to nsUrlClassifierPrefixSet because of better optimization.
-VariableLengthPrefixSet::VariableLengthPrefixSet()
-  : mLock("VariableLengthPrefixSet.mLock")
-  , mMemoryReportPath()
-{
-  mFixedPrefixSet = new nsUrlClassifierPrefixSet();
-}
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::Init(const nsACString& aName)
-{
-  mMemoryReportPath =
-    nsPrintfCString(
-      "explicit/storage/prefix-set/%s",
-      (!aName.IsEmpty() ? PromiseFlatCString(aName).get() : "?!")
-    );
-
-  RegisterWeakMemoryReporter(this);
-
-  return NS_OK;
-}
-
-VariableLengthPrefixSet::~VariableLengthPrefixSet()
-{
-  UnregisterWeakMemoryReporter(this);
-}
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::SetPrefixes(const PrefixStringMap& aPrefixMap)
-{
-  MutexAutoLock lock(mLock);
-
-  // Prefix size should not less than 4-bytes or greater than 32-bytes
-  for (auto iter = aPrefixMap.ConstIter(); !iter.Done(); iter.Next()) {
-    if (iter.Key() < PREFIX_SIZE_FIXED ||
-        iter.Key() > COMPLETE_SIZE) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  // Clear old prefixSet before setting new one.
-  mFixedPrefixSet->SetPrefixes(nullptr, 0);
-  mVLPrefixSet.Clear();
-
-  // 4-bytes prefixes are handled by nsUrlClassifierPrefixSet.
-  nsCString* prefixes = aPrefixMap.Get(PREFIX_SIZE_FIXED);
-  if (prefixes) {
-    NS_ENSURE_TRUE(prefixes->Length() % PREFIX_SIZE_FIXED == 0, NS_ERROR_FAILURE);
-
-    uint32_t numPrefixes = prefixes->Length() / PREFIX_SIZE_FIXED;
-
-#if MOZ_BIG_ENDIAN
-    const uint32_t* arrayPtr = reinterpret_cast<const uint32_t*>(prefixes->BeginReading());
-#else
-    FallibleTArray<uint32_t> array;
-    // Prefixes are lexicographically-sorted, so the interger array
-    // passed to nsUrlClassifierPrefixSet should also follow the same order.
-    // To make sure of that, we convert char array to integer with Big-Endian
-    // instead of casting to integer directly.
-    if (!array.SetCapacity(numPrefixes, fallible)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    const char* begin = prefixes->BeginReading();
-    const char* end = prefixes->EndReading();
-
-    while (begin != end) {
-      array.AppendElement(BigEndian::readUint32(begin), fallible);
-      begin += sizeof(uint32_t);
-    }
-
-    const uint32_t* arrayPtr = array.Elements();
-#endif
-
-    nsresult rv = mFixedPrefixSet->SetPrefixes(arrayPtr, numPrefixes);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // 5~32 bytes prefixes are stored in mVLPrefixSet.
-  for (auto iter = aPrefixMap.ConstIter(); !iter.Done(); iter.Next()) {
-    // Skip 4bytes prefixes because it is already stored in mFixedPrefixSet.
-    if (iter.Key() == PREFIX_SIZE_FIXED) {
-      continue;
-    }
-
-    mVLPrefixSet.Put(iter.Key(), new nsCString(*iter.Data()));
-  }
-
-  return NS_OK;
-}
-
-nsresult
-VariableLengthPrefixSet::GetPrefixes(PrefixStringMap& aPrefixMap)
-{
-  MutexAutoLock lock(mLock);
-
-  // 4-bytes prefixes are handled by nsUrlClassifierPrefixSet.
-  FallibleTArray<uint32_t> array;
-  nsresult rv = mFixedPrefixSet->GetPrefixesNative(array);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  size_t count = array.Length();
-  if (count) {
-    nsCString* prefixes = new nsCString();
-    prefixes->SetLength(PREFIX_SIZE_FIXED * count);
-
-    // Writing integer array to character array
-    uint32_t* begin = reinterpret_cast<uint32_t*>(prefixes->BeginWriting());
-    for (uint32_t i = 0; i < count; i++) {
-      begin[i] = NativeEndian::swapToBigEndian(array[i]);
-    }
-
-    aPrefixMap.Put(PREFIX_SIZE_FIXED, prefixes);
-  }
-
-  // Copy variable-length prefix set
-  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
-    aPrefixMap.Put(iter.Key(), new nsCString(*iter.Data()));
-  }
-
-  return NS_OK;
-}
-
-// It should never be the case that more than one hash prefixes match a given
-// full hash. However, if that happens, this method returns any one of them.
-// It does not guarantee which one of those will be returned.
-NS_IMETHODIMP
-VariableLengthPrefixSet::Matches(const nsACString& aFullHash, uint32_t* aLength)
-{
-  MutexAutoLock lock(mLock);
-
-  // Only allow full-length hash to check if match any of the prefix
-  MOZ_ASSERT(aFullHash.Length() == COMPLETE_SIZE);
-  NS_ENSURE_ARG_POINTER(aLength);
-
-  *aLength = 0;
-
-  // Check if it matches 4-bytes prefixSet first
-  const uint32_t* hash = reinterpret_cast<const uint32_t*>(aFullHash.BeginReading());
-  uint32_t value = BigEndian::readUint32(hash);
-
-  bool found = false;
-  nsresult rv = mFixedPrefixSet->Contains(value, &found);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (found) {
-    *aLength = PREFIX_SIZE_FIXED;
-    return NS_OK;
-  }
-
-  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
-    if (BinarySearch(aFullHash, *iter.Data(), iter.Key())) {
-      *aLength = iter.Key();
-      return NS_OK;
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::IsEmpty(bool* aEmpty)
-{
-  MutexAutoLock lock(mLock);
-
-  NS_ENSURE_ARG_POINTER(aEmpty);
-
-  mFixedPrefixSet->IsEmpty(aEmpty);
-  *aEmpty = *aEmpty && mVLPrefixSet.IsEmpty();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::LoadFromFile(nsIFile* aFile)
-{
-  MutexAutoLock lock(mLock);
-
-  NS_ENSURE_ARG_POINTER(aFile);
-
-  Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_VLPS_FILELOAD_TIME> timer;
-
-  nsCOMPtr<nsIInputStream> localInFile;
-  nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(localInFile), aFile,
-                                           PR_RDONLY | nsIFile::OS_READAHEAD);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Calculate how big the file is, make sure our read buffer isn't bigger
-  // than the file itself which is just wasting memory.
-  int64_t fileSize;
-  rv = aFile->GetFileSize(&fileSize);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (fileSize < 0 || fileSize > UINT32_MAX) {
-    return NS_ERROR_FAILURE;
-  }
-
-  uint32_t bufferSize = std::min<uint32_t>(static_cast<uint32_t>(fileSize),
-                                           MAX_BUFFER_SIZE);
-
-  // Convert to buffered stream
-  nsCOMPtr<nsIInputStream> in = NS_BufferInputStream(localInFile, bufferSize);
-
-  rv = mFixedPrefixSet->LoadPrefixes(in);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = LoadPrefixes(in);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;;
-}
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::StoreToFile(nsIFile* aFile)
-{
-  NS_ENSURE_ARG_POINTER(aFile);
-
-  MutexAutoLock lock(mLock);
-
-  nsCOMPtr<nsIOutputStream> localOutFile;
-  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
-                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t fileSize = 0;
-  // Preallocate the file storage
-  {
-    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
-    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_VLPS_FALLOCATE_TIME> timer;
-
-    fileSize += mFixedPrefixSet->CalculatePreallocateSize();
-    fileSize += CalculatePreallocateSize();
-
-    Unused << fos->Preallocate(fileSize);
-  }
-
-  // Convert to buffered stream
-  nsCOMPtr<nsIOutputStream> out =
-    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
-
-  rv = mFixedPrefixSet->WritePrefixes(out);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = WritePrefixes(out);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-VariableLengthPrefixSet::LoadPrefixes(nsIInputStream* in)
-{
-  uint32_t magic;
-  uint32_t read;
-
-  nsresult rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
-
-  if (magic != PREFIXSET_VERSION_MAGIC) {
-    LOG(("Version magic mismatch, not loading"));
-    return NS_ERROR_FILE_CORRUPTED;
-  }
-
-  mVLPrefixSet.Clear();
-
-  uint32_t count;
-  rv = in->Read(reinterpret_cast<char*>(&count), sizeof(uint32_t), &read);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
-
-  for(;count > 0; count--) {
-    uint8_t prefixSize;
-    rv = in->Read(reinterpret_cast<char*>(&prefixSize), sizeof(uint8_t), &read);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(read == sizeof(uint8_t), NS_ERROR_FAILURE);
-
-    uint32_t stringLength;
-    rv = in->Read(reinterpret_cast<char*>(&stringLength), sizeof(uint32_t), &read);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
-
-    nsCString* vlPrefixes = new nsCString();
-    if (!vlPrefixes->SetLength(stringLength, fallible)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    rv = in->Read(reinterpret_cast<char*>(vlPrefixes->BeginWriting()), stringLength, &read);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(read == stringLength, NS_ERROR_FAILURE);
-
-    mVLPrefixSet.Put(prefixSize, vlPrefixes);
-  }
-
-  return NS_OK;
-}
-
-uint32_t
-VariableLengthPrefixSet::CalculatePreallocateSize()
-{
-  uint32_t fileSize = 0;
-
-  // Store how many prefix string.
-  fileSize += sizeof(uint32_t);
-
-  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
-    // Store prefix size, prefix string length, and prefix string.
-    fileSize += sizeof(uint8_t);
-    fileSize += sizeof(uint32_t);
-    fileSize += iter.Data()->Length();
-  }
-  return fileSize;
-}
-
-nsresult
-VariableLengthPrefixSet::WritePrefixes(nsIOutputStream* out)
-{
-  uint32_t written;
-  uint32_t writelen = sizeof(uint32_t);
-  uint32_t magic = PREFIXSET_VERSION_MAGIC;
-  nsresult rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
-
-  uint32_t count = mVLPrefixSet.Count();
-  rv = out->Write(reinterpret_cast<char*>(&count), writelen, &written);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
-
-  // Store PrefixSize, Length of Prefix String and then Prefix String
-  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
-    const nsCString& vlPrefixes = *iter.Data();
-
-    uint8_t prefixSize = iter.Key();
-    writelen = sizeof(uint8_t);
-    rv = out->Write(reinterpret_cast<char*>(&prefixSize), writelen, &written);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
-
-    uint32_t stringLength = vlPrefixes.Length();
-    writelen = sizeof(uint32_t);
-    rv = out->Write(reinterpret_cast<char*>(&stringLength), writelen, &written);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
-
-    rv = out->Write(const_cast<char*>(vlPrefixes.BeginReading()),
-                    stringLength, &written);
-    NS_ENSURE_SUCCESS(rv, rv);
-    NS_ENSURE_TRUE(stringLength == written, NS_ERROR_FAILURE);
-  }
-
-  return NS_OK;
-}
-
-bool
-VariableLengthPrefixSet::BinarySearch(const nsACString& aFullHash,
-                                         const nsACString& aPrefixes,
-                                         uint32_t aPrefixSize)
-{
-  const char* fullhash = aFullHash.BeginReading();
-  const char* prefixes = aPrefixes.BeginReading();
-  int32_t begin = 0, end = aPrefixes.Length() / aPrefixSize;
-
-  while (end >= begin) {
-    int32_t mid = (begin + end) >> 1;
-    int cmp = memcmp(fullhash, prefixes + mid*aPrefixSize, aPrefixSize);
-    if (cmp < 0) {
-      end = mid - 1;
-    } else if (cmp > 0) {
-      begin = mid + 1;
-    } else {
-      return true;
-    }
-  }
-  return false;
-}
-
-MOZ_DEFINE_MALLOC_SIZE_OF(UrlClassifierMallocSizeOf)
-
-NS_IMETHODIMP
-VariableLengthPrefixSet::CollectReports(nsIHandleReportCallback* aHandleReport,
-                                           nsISupports* aData, bool aAnonymize)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  size_t amount = SizeOfIncludingThis(UrlClassifierMallocSizeOf);
-
-  return aHandleReport->Callback(
-    EmptyCString(), mMemoryReportPath, KIND_HEAP, UNITS_BYTES, amount,
-    NS_LITERAL_CSTRING("Memory used by the variable-length prefix set for a URL classifier."),
-    aData);
-}
-
-size_t
-VariableLengthPrefixSet::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
-{
-  MutexAutoLock lock(mLock);
-
-  size_t n = 0;
-  n += aMallocSizeOf(this);
-  n += mFixedPrefixSet->SizeOfIncludingThis(moz_malloc_size_of) - aMallocSizeOf(mFixedPrefixSet);
-
-  n += mVLPrefixSet.ShallowSizeOfExcludingThis(aMallocSizeOf);
-  for (auto iter = mVLPrefixSet.ConstIter(); !iter.Done(); iter.Next()) {
-    n += iter.Data()->SizeOfExcludingThisIfUnshared(aMallocSizeOf);
-  }
-
-  return n;
-}
-
-} // namespace safebrowsing
-} // namespace mozilla
diff --git a/toolkit/components/url-classifier/VariableLengthPrefixSet.h b/toolkit/components/url-classifier/VariableLengthPrefixSet.h
deleted file mode 100644
index eca214885547..000000000000
--- a/toolkit/components/url-classifier/VariableLengthPrefixSet.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* 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/. */
-
-#ifndef VariableLengthPrefixSet_h
-#define VariableLengthPrefixSet_h
-
-#include "nsISupports.h"
-#include "nsIMemoryReporter.h"
-#include "Entries.h"
-#include "nsTArray.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/Mutex.h"
-
-class nsUrlClassifierPrefixSet;
-
-namespace mozilla {
-namespace safebrowsing {
-
-class VariableLengthPrefixSet final
-  : public nsIMemoryReporter
-{
-public:
-  VariableLengthPrefixSet();
-
-  NS_IMETHOD Init(const nsACString& aName);
-  NS_IMETHOD SetPrefixes(const mozilla::safebrowsing::PrefixStringMap& aPrefixMap);
-  NS_IMETHOD GetPrefixes(mozilla::safebrowsing::PrefixStringMap& aPrefixMap);
-  NS_IMETHOD Matches(const nsACString& aFullHash, uint32_t* aLength);
-  NS_IMETHOD IsEmpty(bool* aEmpty);
-  NS_IMETHOD LoadFromFile(nsIFile* aFile);
-  NS_IMETHOD StoreToFile(nsIFile* aFile);
-
-  size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIMEMORYREPORTER
-
-private:
-  virtual ~VariableLengthPrefixSet();
-
-  static const uint32_t MAX_BUFFER_SIZE = 64 * 1024;
-  static const uint32_t PREFIXSET_VERSION_MAGIC = 1;
-
-  bool BinarySearch(const nsACString& aFullHash,
-                    const nsACString& aPrefixes,
-                    uint32_t aPrefixSize);
-
-  uint32_t CalculatePreallocateSize();
-  nsresult WritePrefixes(nsIOutputStream* out);
-  nsresult LoadPrefixes(nsIInputStream* in);
-
-  // Lock to prevent races between the url-classifier thread (which does most
-  // of the operations) and the main thread (which does memory reporting).
-  // It should be held for all operations between Init() and destruction that
-  // touch this class's data members.
-  mozilla::Mutex mLock;
-
-  RefPtr<nsUrlClassifierPrefixSet> mFixedPrefixSet;
-  mozilla::safebrowsing::PrefixStringMap mVLPrefixSet;
-
-  nsCString mMemoryReportPath;
-};
-
-} // namespace safebrowsing
-} // namespace mozilla
-
-#endif
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
index 411769534a76..acf89e5ef343 100644
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -24,7 +24,6 @@ UNIFIED_SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
     'LookupCache.cpp',
-    'LookupCacheV4.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
     'nsUrlClassifierProxies.cpp',
@@ -37,7 +36,6 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'nsUrlClassifierPrefixSet.cpp',
     'nsUrlClassifierStreamUpdater.cpp',
-    'VariableLengthPrefixSet.cpp',
 ]
 
 # contains variables that conflict with LookupCache.cpp
@@ -63,10 +61,8 @@ EXTRA_JS_MODULES += [
 EXPORTS += [
     'Entries.h',
     'LookupCache.h',
-    'LookupCacheV4.h',
     'nsUrlClassifierPrefixSet.h',
     'protobuf/safebrowsing.pb.h',
-    'VariableLengthPrefixSet.h',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
index 87456547036c..ad70dd7de200 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
@@ -338,55 +338,10 @@ nsUrlClassifierPrefixSet::LoadFromFile(nsIFile* aFile)
   // Convert to buffered stream
   nsCOMPtr<nsIInputStream> in = NS_BufferInputStream(localInFile, bufferSize);
 
-  rv = LoadPrefixes(in);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsUrlClassifierPrefixSet::StoreToFile(nsIFile* aFile)
-{
-  MutexAutoLock lock(mLock);
-
-  nsCOMPtr<nsIOutputStream> localOutFile;
-  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
-                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t fileSize;
-
-  // Preallocate the file storage
-  {
-    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
-    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_FALLOCATE_TIME> timer;
-
-    fileSize = CalculatePreallocateSize();
-
-    // Ignore failure, the preallocation is a hint and we write out the entire
-    // file later on
-    Unused << fos->Preallocate(fileSize);
-  }
-
-  // Convert to buffered stream
-  nsCOMPtr<nsIOutputStream> out =
-    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
-
-  rv = WritePrefixes(out);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  LOG(("Saving PrefixSet successful\n"));
-
-  return NS_OK;
-}
-
-nsresult
-nsUrlClassifierPrefixSet::LoadPrefixes(nsIInputStream* in)
-{
   uint32_t magic;
   uint32_t read;
 
-  nsresult rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
+  rv = in->Read(reinterpret_cast<char*>(&magic), sizeof(uint32_t), &read);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(read == sizeof(uint32_t), NS_ERROR_FAILURE);
 
@@ -456,23 +411,40 @@ nsUrlClassifierPrefixSet::LoadPrefixes(nsIInputStream* in)
   return NS_OK;
 }
 
-uint32_t
-nsUrlClassifierPrefixSet::CalculatePreallocateSize()
+NS_IMETHODIMP
+nsUrlClassifierPrefixSet::StoreToFile(nsIFile* aFile)
 {
-  uint32_t fileSize = 4 * sizeof(uint32_t);
-  uint32_t deltas = mTotalPrefixes - mIndexPrefixes.Length();
-  fileSize += 2 * mIndexPrefixes.Length() * sizeof(uint32_t);
-  fileSize += deltas * sizeof(uint16_t);
-  return fileSize;
-}
+  MutexAutoLock lock(mLock);
+
+  nsCOMPtr<nsIOutputStream> localOutFile;
+  nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(localOutFile), aFile,
+                                            PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  uint32_t fileSize;
+
+  // Preallocate the file storage
+  {
+    nsCOMPtr<nsIFileOutputStream> fos(do_QueryInterface(localOutFile));
+    Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_PS_FALLOCATE_TIME> timer;
+    fileSize = 4 * sizeof(uint32_t);
+    uint32_t deltas = mTotalPrefixes - mIndexPrefixes.Length();
+    fileSize += 2 * mIndexPrefixes.Length() * sizeof(uint32_t);
+    fileSize += deltas * sizeof(uint16_t);
+
+    // Ignore failure, the preallocation is a hint and we write out the entire
+    // file later on
+    Unused << fos->Preallocate(fileSize);
+  }
+
+  // Convert to buffered stream
+  nsCOMPtr<nsIOutputStream> out =
+    NS_BufferOutputStream(localOutFile, std::min(fileSize, MAX_BUFFER_SIZE));
 
-nsresult
-nsUrlClassifierPrefixSet::WritePrefixes(nsIOutputStream* out)
-{
   uint32_t written;
   uint32_t writelen = sizeof(uint32_t);
   uint32_t magic = PREFIXSET_VERSION_MAGIC;
-  nsresult rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
+  rv = out->Write(reinterpret_cast<char*>(&magic), writelen, &written);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(written == writelen, NS_ERROR_FAILURE);
 
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
index 8627b75d0c7f..90163a2f8a4a 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
@@ -12,7 +12,6 @@
 #include "nsIFile.h"
 #include "nsIMemoryReporter.h"
 #include "nsIMutableArray.h"
-#include "nsIFileStreams.h"
 #include "nsIUrlClassifierPrefixSet.h"
 #include "nsTArray.h"
 #include "nsToolkitCompsCID.h"
@@ -20,14 +19,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Mutex.h"
 
-namespace mozilla {
-namespace safebrowsing {
-
-class VariableLengthPrefixSet;
-
-} // namespace safebrowsing
-} // namespace mozilla
-
 class nsUrlClassifierPrefixSet final
   : public nsIUrlClassifierPrefixSet
   , public nsIMemoryReporter
@@ -50,8 +41,6 @@ public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIMEMORYREPORTER
 
-  friend class mozilla::safebrowsing::VariableLengthPrefixSet;
-
 private:
   virtual ~nsUrlClassifierPrefixSet();
 
@@ -63,10 +52,6 @@ private:
   nsresult MakePrefixSet(const uint32_t* aArray, uint32_t aLength);
   uint32_t BinSearch(uint32_t start, uint32_t end, uint32_t target);
 
-  uint32_t CalculatePreallocateSize();
-  nsresult WritePrefixes(nsIOutputStream* out);
-  nsresult LoadPrefixes(nsIInputStream* in);
-
   // Lock to prevent races between the url-classifier thread (which does most
   // of the operations) and the main thread (which does memory reporting).
   // It should be held for all operations between Init() and destruction that
diff --git a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
index e0ad04a295b2..64e2a81d4f7f 100644
--- a/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
+++ b/toolkit/components/url-classifier/tests/gtest/TestPerProviderDirectory.cpp
@@ -1,5 +1,4 @@
 #include "LookupCache.h"
-#include "LookupCacheV4.h"
 #include "HashStore.h"
 #include "gtest/gtest.h"
 #include "nsIThread.h"
@@ -82,12 +81,12 @@ TEST(PerProviderDirectory, LookupCache)
 
     // For V2 tables (NOT ending with '-proto'), root directory should be
     // used as the private store.
-    VerifyPrivateStorePath<LookupCacheV2>("goog-phish-shavar", "google", rootDir, false);
+    VerifyPrivateStorePath<LookupCache>("goog-phish-shavar", "google", rootDir, false);
 
     // For V4 tables, if provider is found, use per-provider subdirectory;
     // If not found, use root directory.
-    VerifyPrivateStorePath<LookupCacheV4>("goog-noprovider-proto", "", rootDir, false);
-    VerifyPrivateStorePath<LookupCacheV4>("goog-phish-proto", "google4", rootDir, true);
+    VerifyPrivateStorePath<LookupCache>("goog-noprovider-proto", "", rootDir, false);
+    VerifyPrivateStorePath<LookupCache>("goog-phish-proto", "google4", rootDir, true);
   });
 }
 
diff --git a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
deleted file mode 100644
index f1749dbb90c6..000000000000
--- a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-#include "Classifier.h"
-#include "HashStore.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIFile.h"
-#include "nsIThread.h"
-#include "string.h"
-#include "gtest/gtest.h"
-#include "nsThreadUtils.h"
-
-using namespace mozilla;
-using namespace mozilla::safebrowsing;
-
-typedef nsCString _Prefix;
-typedef nsTArray<_Prefix> _PrefixArray;
-
-// This function removes common elements of inArray and outArray from
-// outArray. This is used by partial update testcase to ensure partial update
-// data won't contain prefixes we already have.
-static void
-RemoveIntersection(const _PrefixArray& inArray, _PrefixArray& outArray)
-{
-  for (uint32_t i = 0; i < inArray.Length(); i++) {
-    int32_t idx = outArray.BinaryIndexOf(inArray[i]);
-    if (idx >= 0) {
-      outArray.RemoveElementAt(idx);
-    }
-  }
-}
-
-// This fucntion removes elements from outArray by index specified in
-// removal array.
-static void
-RemoveElements(const nsTArray<uint32_t>& removal, _PrefixArray& outArray)
-{
-  for (int32_t i = removal.Length() - 1; i >= 0; i--) {
-    outArray.RemoveElementAt(removal[i]);
-  }
-}
-
-// This function converts lexigraphic-sorted prefixes to a hashtable
-// which key is prefix size and value is concatenated prefix string.
-static void
-PrefixArrayToPrefixStringMap(const _PrefixArray& prefixArray,
-                             PrefixStringMap& outMap)
-{
-  outMap.Clear();
-
-  for (uint32_t i = 0; i < prefixArray.Length(); i++) {
-    const _Prefix& prefix = prefixArray[i];
-    nsCString* prefixString = outMap.LookupOrAdd(prefix.Length());
-    prefixString->Append(prefix.BeginReading(), prefix.Length());
-  }
-}
-
-// N: Number of prefixes, MIN/MAX: minimum/maximum prefix size
-// This function will append generated prefixes to outArray.
-static void
-CreateRandomSortedPrefixArray(uint32_t N,
-                              uint32_t MIN,
-                              uint32_t MAX,
-                              _PrefixArray& outArray)
-{
-  outArray.SetCapacity(outArray.Length() + N);
-
-  const uint32_t range = (MAX - MIN + 1);
-
-  for (uint32_t i = 0; i < N; i++) {
-    uint32_t prefixSize = (rand() % range) + MIN;
-    _Prefix prefix;
-    prefix.SetLength(prefixSize);
-
-    while (true) {
-      char* dst = prefix.BeginWriting();
-      for (uint32_t j = 0; j < prefixSize; j++) {
-        dst[j] = rand() % 256;
-      }
-
-      if (!outArray.Contains(prefix)) {
-        outArray.AppendElement(prefix);
-        break;
-      }
-    }
-  }
-
-  outArray.Sort();
-}
-
-// N: Number of removal indices, MAX: maximum index
-static void
-CreateRandomRemovalIndices(uint32_t N,
-                           uint32_t MAX,
-                           nsTArray<uint32_t>& outArray)
-{
-  for (uint32_t i = 0; i < N; i++) {
-    uint32_t idx = rand() % MAX;
-    if (!outArray.Contains(idx)) {
-      outArray.InsertElementSorted(idx);
-    }
-  }
-}
-
-// Function to generate TableUpdateV4.
-static void
-GenerateUpdateData(bool fullUpdate,
-                   PrefixStringMap& add,
-                   nsTArray<uint32_t>& removal,
-                   nsTArray<TableUpdate*>& tableUpdates)
-{
-  TableUpdateV4* tableUpdate = new TableUpdateV4(NS_LITERAL_CSTRING("gtest-malware-proto"));
-  tableUpdate->SetFullUpdate(fullUpdate);
-
-  for (auto iter = add.ConstIter(); !iter.Done(); iter.Next()) {
-    nsCString* pstring = iter.Data();
-    std::string str(pstring->BeginReading(), pstring->Length());
-
-    tableUpdate->NewPrefixes(iter.Key(), str);
-  }
-
-  tableUpdate->NewRemovalIndices(removal.Elements(), removal.Length());
-
-  tableUpdates.AppendElement(tableUpdate);
-}
-
-static void
-VerifyPrefixSet(PrefixStringMap& expected)
-{
-  // Verify the prefix set is written to disk.
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-
-  file->AppendNative(NS_LITERAL_CSTRING("safebrowsing"));
-  file->AppendNative(NS_LITERAL_CSTRING("gtest-malware-proto.pset"));
-
-  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
-  load->Init(NS_LITERAL_CSTRING("gtest-malware-proto"));
-
-  PrefixStringMap prefixesInFile;
-  load->LoadFromFile(file);
-  load->GetPrefixes(prefixesInFile);
-
-  for (auto iter = expected.ConstIter(); !iter.Done(); iter.Next()) {
-    nsCString* expectedPrefix = iter.Data();
-    nsCString* resultPrefix = prefixesInFile.Get(iter.Key());
-
-    ASSERT_TRUE(*resultPrefix == *expectedPrefix);
-  }
-}
-
-static void
-Clear()
-{
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-
-  UniquePtr<Classifier> classifier(new Classifier());
-  classifier->Open(*file);
-  classifier->Reset();
-}
-
-static void
-testUpdateFail(nsTArray<TableUpdate*>& tableUpdates)
-{
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-
-  UniquePtr<Classifier> classifier(new Classifier());
-  classifier->Open(*file);
-
-  RunTestInNewThread([&] () -> void {
-    nsresult rv = classifier->ApplyUpdates(&tableUpdates);
-    ASSERT_TRUE(NS_FAILED(rv));
-  });
-}
-
-static void
-testUpdate(nsTArray<TableUpdate*>& tableUpdates,
-           PrefixStringMap& expected)
-{
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-
-  UniquePtr<Classifier> classifier(new Classifier());
-  classifier->Open(*file);
-
-  RunTestInNewThread([&] () -> void {
-    nsresult rv = classifier->ApplyUpdates(&tableUpdates);
-    ASSERT_TRUE(rv == NS_OK);
-
-    VerifyPrefixSet(expected);
-  });
-}
-
-static void
-testFullUpdate(PrefixStringMap& add)
-{
-  nsTArray<uint32_t> empty;
-  nsTArray<TableUpdate*> tableUpdates;
-  GenerateUpdateData(true, add, empty, tableUpdates);
-
-  testUpdate(tableUpdates, add);
-}
-
-static void
-testPartialUpdate(PrefixStringMap& add,
-                  nsTArray<uint32_t>& removal,
-                  PrefixStringMap& expected)
-{
-  nsTArray<TableUpdate*> tableUpdates;
-  GenerateUpdateData(false, add, removal, tableUpdates);
-
-  testUpdate(tableUpdates, expected);
-}
-
-
-TEST(UrlClassifierTableUpdateV4, FixLenghtPSetFullUpdate)
-{
-  srand(time(NULL));
-
-   _PrefixArray array;
-  PrefixStringMap map;
-
-  CreateRandomSortedPrefixArray(5000, 4, 4, array);
-  PrefixArrayToPrefixStringMap(array, map);
-
-  testFullUpdate(map);
-
-  Clear();
-}
-
-
-TEST(UrlClassifierTableUpdateV4, VariableLenghtPSetFullUpdate)
-{
-   _PrefixArray array;
-  PrefixStringMap map;
-
-  CreateRandomSortedPrefixArray(5000, 5, 32, array);
-  PrefixArrayToPrefixStringMap(array, map);
-
-  testFullUpdate(map);
-
-  Clear();
-}
-
-// This test contain both variable length prefix set and fixed-length prefix set
-TEST(UrlClassifierTableUpdateV4, MixedPSetFullUpdate)
-{
-   _PrefixArray array;
-  PrefixStringMap map;
-
-  CreateRandomSortedPrefixArray(5000, 4, 4, array);
-  CreateRandomSortedPrefixArray(1000, 5, 32, array);
-  PrefixArrayToPrefixStringMap(array, map);
-
-  testFullUpdate(map);
-
-  Clear();
-}
-
-TEST(UrlClassifierTableUpdateV4, PartialUpdateWithRemoval)
-{
-  _PrefixArray fArray, pArray, mergedArray;
-  PrefixStringMap fMap, pMap, mergedMap;
-
-  {
-    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
-    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    // Remove 1/5 of elements of original prefix set.
-    nsTArray<uint32_t> removal;
-    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
-    RemoveElements(removal, fArray);
-
-    // Calculate the expected prefix map.
-    mergedArray.AppendElements(fArray);
-    mergedArray.AppendElements(pArray);
-    mergedArray.Sort();
-    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
-
-    testPartialUpdate(pMap, removal, mergedMap);
-  }
-
-  Clear();
-}
-
-TEST(UrlClassifierTableUpdateV4, PartialUpdateWithoutRemoval)
-{
-  _PrefixArray fArray, pArray, mergedArray;
-  PrefixStringMap fMap, pMap, mergedMap;
-
-  {
-    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
-    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    nsTArray<uint32_t> empty;
-
-    CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    // Calculate the expected prefix map.
-    mergedArray.AppendElements(fArray);
-    mergedArray.AppendElements(pArray);
-    mergedArray.Sort();
-    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
-
-    testPartialUpdate(pMap, empty, mergedMap);
-  }
-
-  Clear();
-}
-
-// Expect failure because partial update contains prefix already
-// in old prefix set.
-TEST(UrlClassifierTableUpdateV4, PartialUpdatePrefixAlreadyExist)
-{
-  _PrefixArray fArray, pArray;
-  PrefixStringMap fMap, pMap;
-
-  {
-    CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    nsTArray<uint32_t> empty;
-    nsTArray<TableUpdate*> tableUpdates;
-
-    // Pick one prefix from full update prefix and add it to partial update.
-    // This should result a failure when call ApplyUpdates.
-    pArray.AppendElement(fArray[rand() % fArray.Length()]);
-    CreateRandomSortedPrefixArray(200, 4, 32, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    GenerateUpdateData(false, pMap, empty, tableUpdates);
-    testUpdateFail(tableUpdates);
-  }
-
-  Clear();
-}
-
-// Test apply partial update directly without applying an full update first.
-TEST(UrlClassifierTableUpdateV4, OnlyPartialUpdate)
-{
-  _PrefixArray pArray;
-  PrefixStringMap pMap;
-  nsTArray<uint32_t> empty;
-
-  CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
-  CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-  PrefixArrayToPrefixStringMap(pArray, pMap);
-
-  testPartialUpdate(pMap, empty, pMap);
-
-  Clear();
-}
-
-// Test partial update without any ADD prefixes, only removalIndices.
-TEST(UrlClassifierTableUpdateV4, PartialUpdateOnlyRemoval)
-{
-  _PrefixArray fArray, pArray;
-  PrefixStringMap fMap, pMap, mergedMap;
-
-  {
-    CreateRandomSortedPrefixArray(5000, 4, 4, fArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    // Remove 1/5 of elements of original prefix set.
-    nsTArray<uint32_t> removal;
-    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
-    RemoveElements(removal, fArray);
-
-    PrefixArrayToPrefixStringMap(fArray, mergedMap);
-
-    testPartialUpdate(pMap, removal, mergedMap);
-  }
-
-  Clear();
-}
-
-// Test one tableupdate array contains full update and multiple partial updates.
-TEST(UrlClassifierTableUpdateV4, MultipleTableUpdates)
-{
-  _PrefixArray fArray, pArray, mergedArray;
-  PrefixStringMap fMap, pMap, mergedMap;
-
-  {
-    nsTArray<uint32_t> empty;
-    nsTArray<TableUpdate*> tableUpdates;
-
-    // Generate first full udpate
-    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
-    CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    GenerateUpdateData(true, fMap, empty, tableUpdates);
-
-    // Generate second partial update
-    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    GenerateUpdateData(false, pMap, empty, tableUpdates);
-
-    // Generate thrid partial update
-    fArray.AppendElements(pArray);
-    fArray.Sort();
-    pArray.Clear();
-    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    // Remove 1/5 of elements of original prefix set.
-    nsTArray<uint32_t> removal;
-    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
-    RemoveElements(removal, fArray);
-
-    GenerateUpdateData(false, pMap, removal, tableUpdates);
-
-    mergedArray.AppendElements(fArray);
-    mergedArray.AppendElements(pArray);
-    mergedArray.Sort();
-    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
-
-    testUpdate(tableUpdates, mergedMap);
-  }
-
-  Clear();
-}
-
-// Test apply full update first, and then apply multiple partial updates
-// in one tableupdate array.
-TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
-{
-  _PrefixArray fArray, pArray, mergedArray;
-  PrefixStringMap fMap, pMap, mergedMap;
-
-  {
-    // Generate first full udpate
-    CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
-    CreateRandomSortedPrefixArray(3000, 5, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    nsTArray<uint32_t> removal;
-    nsTArray<TableUpdate*> tableUpdates;
-
-    // Generate first partial update
-    CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    // Remove 1/5 of elements of original prefix set.
-    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
-    RemoveElements(removal, fArray);
-
-    GenerateUpdateData(false, pMap, removal, tableUpdates);
-
-    fArray.AppendElements(pArray);
-    fArray.Sort();
-    pArray.Clear();
-    removal.Clear();
-
-    // Generate second partial update.
-    CreateRandomSortedPrefixArray(2000, 4, 4, pArray);
-    CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    // Remove 1/5 of elements of original prefix set.
-    CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
-    RemoveElements(removal, fArray);
-
-    GenerateUpdateData(false, pMap, removal, tableUpdates);
-
-    mergedArray.AppendElements(fArray);
-    mergedArray.AppendElements(pArray);
-    mergedArray.Sort();
-    PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
-
-    testUpdate(tableUpdates, mergedMap);
-  }
-
-  Clear();
-}
-
-// Test removal indices are larger than the original prefix set.
-TEST(UrlClassifierTableUpdateV4, RemovalIndexTooLarge)
-{
-  _PrefixArray fArray, pArray;
-  PrefixStringMap fMap, pMap;
-
-  {
-    CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
-    PrefixArrayToPrefixStringMap(fArray, fMap);
-
-    testFullUpdate(fMap);
-  }
-
-  {
-    nsTArray<uint32_t> removal;
-    nsTArray<TableUpdate*> tableUpdates;
-
-    CreateRandomSortedPrefixArray(200, 4, 32, pArray);
-    RemoveIntersection(fArray, pArray);
-    PrefixArrayToPrefixStringMap(pArray, pMap);
-
-    for (uint32_t i = 0; i < fArray.Length() + 1 ;i++) {
-      removal.AppendElement(i);
-    }
-
-    GenerateUpdateData(false, pMap, removal, tableUpdates);
-    testUpdateFail(tableUpdates);
-  }
-
-  Clear();
-}
diff --git a/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp b/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp
deleted file mode 100644
index 9e380a9d360f..000000000000
--- a/toolkit/components/url-classifier/tests/gtest/TestVariableLengthPrefixSet.cpp
+++ /dev/null
@@ -1,559 +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/. */
-
-#include <mozilla/RefPtr.h>
-#include "nsString.h"
-#include "nsTArray.h"
-#include "nsClassHashtable.h"
-#include "VariableLengthPrefixSet.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIFile.h"
-#include "gtest/gtest.h"
-
-using namespace mozilla::safebrowsing;
-
-typedef nsCString _Prefix;
-typedef nsTArray<_Prefix> _PrefixArray;
-
-// Create fullhash by appending random characters.
-static nsCString* CreateFullHash(const nsACString& in)
-{
-  nsCString* out = new nsCString(in);
-  out->SetLength(32);
-  for (size_t i = in.Length(); i < 32; i++) {
-    out->SetCharAt(char(rand() % 256), i);
-  }
-
-  return out;
-}
-
-// This function generate N prefixes with size between MIN and MAX.
-// The output array will not be cleared, random result will append to it
-static void RandomPrefixes(uint32_t N, uint32_t MIN, uint32_t MAX, _PrefixArray& array)
-{
-  array.SetCapacity(array.Length() + N);
-
-  uint32_t range = (MAX - MIN + 1);
-
-  for (uint32_t i = 0; i < N; i++) {
-    uint32_t prefixSize = (rand() % range) + MIN;
-    _Prefix prefix;
-    prefix.SetLength(prefixSize);
-
-    bool added = false;
-    while(!added) {
-      char* dst = prefix.BeginWriting();
-      for (uint32_t j = 0; j < prefixSize; j++) {
-        dst[j] = rand() % 256;
-      }
-
-      if (!array.Contains(prefix)) {
-        array.AppendElement(prefix);
-        added = true;
-      }
-    }
-  }
-}
-
-static void CheckContent(VariableLengthPrefixSet* pset,
-                         PrefixStringMap& expected)
-{
-  PrefixStringMap vlPSetMap;
-  pset->GetPrefixes(vlPSetMap);
-
-  for (auto iter = vlPSetMap.Iter(); !iter.Done(); iter.Next()) {
-    nsCString* expectedPrefix = expected.Get(iter.Key());
-    nsCString* resultPrefix = iter.Data();
-
-    ASSERT_TRUE(resultPrefix->Equals(*expectedPrefix));
-  }
-}
-
-// This test loops through all the prefixes and converts each prefix to
-// fullhash by appending random characters, each converted fullhash
-// should at least match its original length in the prefixSet.
-static void DoExpectedLookup(VariableLengthPrefixSet* pset,
-                             _PrefixArray& array)
-{
-  uint32_t matchLength = 0;
-  for (uint32_t i = 0; i < array.Length(); i++) {
-    const nsCString& prefix = array[i];
-    UniquePtr<nsCString> fullhash(CreateFullHash(prefix));
-
-    // Find match for prefix-generated full hash
-    pset->Matches(*fullhash, &matchLength);
-    MOZ_ASSERT(matchLength != 0);
-
-    if (matchLength != prefix.Length()) {
-      // Return match size is not the same as prefix size.
-      // In this case it could be because the generated fullhash match other
-      // prefixes, check if this prefix exist.
-      bool found = false;
-
-      for (uint32_t j = 0; j < array.Length(); j++) {
-        if (array[j].Length() != matchLength) {
-          continue;
-        }
-
-        if (0 == memcmp(fullhash->BeginReading(),
-                        array[j].BeginReading(),
-                        matchLength)) {
-          found = true;
-          break;
-        }
-      }
-      ASSERT_TRUE(found);
-    }
-  }
-}
-
-static void DoRandomLookup(VariableLengthPrefixSet* pset,
-                           uint32_t N,
-                           _PrefixArray& array)
-{
-  for (uint32_t i = 0; i < N; i++) {
-    // Random 32-bytes test fullhash
-    char buf[32];
-    for (uint32_t j = 0; j < 32; j++) {
-      buf[j] = (char)(rand() % 256);
-    }
-
-    // Get the expected result.
-    nsTArray<uint32_t> expected;
-    for (uint32_t j = 0; j < array.Length(); j++) {
-      const nsACString& str = array[j];
-      if (0 == memcmp(buf, str.BeginReading(), str.Length())) {
-        expected.AppendElement(str.Length());
-      }
-    }
-
-    uint32_t matchLength = 0;
-    pset->Matches(nsDependentCSubstring(buf, 32), &matchLength);
-
-    ASSERT_TRUE(expected.IsEmpty() ? !matchLength : expected.Contains(matchLength));
-  }
-}
-
-static void SetupPrefixMap(const _PrefixArray& array,
-                             PrefixStringMap& map)
-{
-  map.Clear();
-
-  // Buckets are keyed by prefix length and contain an array of
-  // all prefixes of that length.
-  nsClassHashtable<nsUint32HashKey, _PrefixArray> table;
-
-  for (uint32_t i = 0; i < array.Length(); i++) {
-    _PrefixArray* prefixes = table.Get(array[i].Length());
-    if (!prefixes) {
-      prefixes = new _PrefixArray();
-      table.Put(array[i].Length(), prefixes);
-    }
-
-    prefixes->AppendElement(array[i]);
-  }
-
-  // The resulting map entries will be a concatenation of all
-  // prefix data for the prefixes of a given size.
-  for (auto iter = table.Iter(); !iter.Done(); iter.Next()) {
-    uint32_t size = iter.Key();
-    uint32_t count = iter.Data()->Length();
-
-    _Prefix* str = new _Prefix();
-    str->SetLength(size * count);
-
-    char* dst = str->BeginWriting();
-
-    iter.Data()->Sort();
-    for (uint32_t i = 0; i < count; i++) {
-      memcpy(dst, iter.Data()->ElementAt(i).get(), size);
-      dst += size;
-    }
-
-    map.Put(size, str);
-  }
-}
-
-
-// Test setting prefix set with only 4-bytes prefixes
-TEST(VariableLengthPrefixSet, FixedLengthSet)
-{
-  srand(time(nullptr));
-
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  PrefixStringMap map;
-  _PrefixArray array = { _Prefix("alph"), _Prefix("brav"), _Prefix("char"),
-                         _Prefix("delt"), _Prefix("echo"), _Prefix("foxt"),
-                       };
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-
-  // Run random test
-  array.Clear();
-  map.Clear();
-
-  RandomPrefixes(1500, 4, 4, array);
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-}
-
-// Test setting prefix set with only 5~32 bytes prefixes
-TEST(VariableLengthPrefixSet, VariableLengthSet)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  PrefixStringMap map;
-  _PrefixArray array = { _Prefix("bravo"), _Prefix("charlie"), _Prefix("delta"),
-                         _Prefix("EchoEchoEchoEchoEcho"), _Prefix("foxtrot"),
-                         _Prefix("GolfGolfGolfGolfGolfGolfGolfGolf"),
-                         _Prefix("hotel"), _Prefix("november"),
-                         _Prefix("oscar"), _Prefix("quebec"), _Prefix("romeo"),
-                         _Prefix("sierrasierrasierrasierrasierra"),
-                         _Prefix("Tango"), _Prefix("whiskey"), _Prefix("yankee"),
-                         _Prefix("ZuluZuluZuluZulu")
-                       };
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-
-  // Run random test
-  array.Clear();
-  map.Clear();
-
-  RandomPrefixes(1500, 5, 32, array);
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-
-}
-
-// Test setting prefix set with both 4-bytes prefixes and 5~32 bytes prefixes
-TEST(VariableLengthPrefixSet, MixedPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  PrefixStringMap map;
-  _PrefixArray array = { _Prefix("enus"), _Prefix("apollo"), _Prefix("mars"),
-                         _Prefix("Hecatonchires cyclopes"),
-                         _Prefix("vesta"), _Prefix("neptunus"), _Prefix("jupiter"),
-                         _Prefix("diana"), _Prefix("minerva"), _Prefix("ceres"),
-                         _Prefix("Aidos,Adephagia,Adikia,Aletheia"),
-                         _Prefix("hecatonchires"), _Prefix("alcyoneus"), _Prefix("hades"),
-                         _Prefix("vulcanus"), _Prefix("juno"), _Prefix("mercury"),
-                         _Prefix("Stheno, Euryale and Medusa")
-                       };
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-
-  // Run random test
-  array.Clear();
-  map.Clear();
-
-  RandomPrefixes(1500, 4, 32, array);
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-}
-
-// Test resetting prefix set
-TEST(VariableLengthPrefixSet, ResetPrefix)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  // First prefix set
-  _PrefixArray array1 = { _Prefix("Iceland"), _Prefix("Peru"), _Prefix("Mexico"),
-                          _Prefix("Australia"), _Prefix("Japan"), _Prefix("Egypt"),
-                          _Prefix("America"), _Prefix("Finland"), _Prefix("Germany"),
-                          _Prefix("Italy"), _Prefix("France"), _Prefix("Taiwan"),
-                        };
-  {
-    PrefixStringMap map;
-
-    SetupPrefixMap(array1, map);
-    pset->SetPrefixes(map);
-
-    DoExpectedLookup(pset, array1);
-  }
-
-  // Second
-  _PrefixArray array2 = { _Prefix("Pikachu"), _Prefix("Bulbasaur"), _Prefix("Charmander"),
-                          _Prefix("Blastoise"), _Prefix("Pidgey"), _Prefix("Mewtwo"),
-                          _Prefix("Jigglypuff"), _Prefix("Persian"), _Prefix("Tentacool"),
-                          _Prefix("Onix"), _Prefix("Eevee"), _Prefix("Jynx"),
-                        };
-  {
-    PrefixStringMap map;
-
-    SetupPrefixMap(array2, map);
-    pset->SetPrefixes(map);
-
-    DoExpectedLookup(pset, array2);
-  }
-
-  // Should not match any of the first prefix set
-  uint32_t matchLength = 0;
-  for (uint32_t i = 0; i < array1.Length(); i++) {
-    UniquePtr<nsACString> fullhash(CreateFullHash(array1[i]));
-
-    pset->Matches(*fullhash, &matchLength);
-    ASSERT_TRUE(matchLength == 0);
-  }
-}
-
-// Test only set one 4-bytes prefix and one full-length prefix
-TEST(VariableLengthPrefixSet, TinyPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  PrefixStringMap map;
-  _PrefixArray array = { _Prefix("AAAA"),
-                         _Prefix("11112222333344445555666677778888"),
-                       };
-
-  SetupPrefixMap(array, map);
-  pset->SetPrefixes(map);
-
-  DoExpectedLookup(pset, array);
-
-  DoRandomLookup(pset, 1000, array);
-
-  CheckContent(pset, map);
-}
-
-// Test empty prefix set and IsEmpty function
-TEST(VariableLengthPrefixSet, EmptyPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  bool empty;
-  pset->IsEmpty(&empty);
-  ASSERT_TRUE(empty);
-
-  PrefixStringMap map;
-  _PrefixArray array1;
-
-  // Lookup an empty array should never match
-  DoRandomLookup(pset, 100, array1);
-
-  // Insert an 4-bytes prefix, then IsEmpty should return false
-  _PrefixArray array2 = { _Prefix("test") };
-  SetupPrefixMap(array2, map);
-  pset->SetPrefixes(map);
-
-  pset->IsEmpty(&empty);
-  ASSERT_TRUE(!empty);
-
-  _PrefixArray array3 = { _Prefix("test variable length") };
-
-  // Insert an 5~32 bytes prefix, then IsEmpty should return false
-  SetupPrefixMap(array3, map);
-  pset->SetPrefixes(map);
-
-  pset->IsEmpty(&empty);
-  ASSERT_TRUE(!empty);
-}
-
-// Test prefix size should only between 4~32 bytes
-TEST(VariableLengthPrefixSet, MinMaxPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> pset = new VariableLengthPrefixSet;
-  pset->Init(NS_LITERAL_CSTRING("test"));
-
-  PrefixStringMap map;
-  {
-    _PrefixArray array = { _Prefix("1234"),
-                           _Prefix("ABCDEFGHIJKKMNOP"),
-                           _Prefix("1aaa2bbb3ccc4ddd5eee6fff7ggg8hhh") };
-
-    SetupPrefixMap(array, map);
-    nsresult rv = pset->SetPrefixes(map);
-    ASSERT_TRUE(rv == NS_OK);
-  }
-
-  // Prefix size less than 4-bytes should fail
-  {
-    _PrefixArray array = { _Prefix("123") };
-
-    SetupPrefixMap(array, map);
-    nsresult rv = pset->SetPrefixes(map);
-    ASSERT_TRUE(NS_FAILED(rv));
-  }
-
-  // Prefix size greater than 32-bytes should fail
-  {
-    _PrefixArray array = { _Prefix("1aaa2bbb3ccc4ddd5eee6fff7ggg8hhh9") };
-
-    SetupPrefixMap(array, map);
-    nsresult rv = pset->SetPrefixes(map);
-    ASSERT_TRUE(NS_FAILED(rv));
-  }
-}
-
-// Test save then load prefix set with only 4-bytes prefixes
-TEST(VariableLengthPrefixSet, LoadSaveFixedLengthPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
-  save->Init(NS_LITERAL_CSTRING("test-save"));
-
-  _PrefixArray array;
-  RandomPrefixes(10000, 4, 4, array);
-
-  PrefixStringMap map;
-  SetupPrefixMap(array, map);
-  save->SetPrefixes(map);
-
-  DoExpectedLookup(save, array);
-
-  DoRandomLookup(save, 1000, array);
-
-  CheckContent(save, map);
-
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-  file->Append(NS_LITERAL_STRING("test.vlpset"));
-
-  save->StoreToFile(file);
-
-  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
-  load->Init(NS_LITERAL_CSTRING("test-load"));
-
-  load->LoadFromFile(file);
-
-  DoExpectedLookup(load, array);
-
-  DoRandomLookup(load, 1000, array);
-
-  CheckContent(load, map);
-
-  file->Remove(false);
-}
-
-// Test save then load prefix set with only 5~32 bytes prefixes
-TEST(VariableLengthPrefixSet, LoadSaveVariableLengthPrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
-  save->Init(NS_LITERAL_CSTRING("test-save"));
-
-  _PrefixArray array;
-  RandomPrefixes(10000, 5, 32, array);
-
-  PrefixStringMap map;
-  SetupPrefixMap(array, map);
-  save->SetPrefixes(map);
-
-  DoExpectedLookup(save, array);
-
-  DoRandomLookup(save, 1000, array);
-
-  CheckContent(save, map);
-
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-  file->Append(NS_LITERAL_STRING("test.vlpset"));
-
-  save->StoreToFile(file);
-
-  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
-  load->Init(NS_LITERAL_CSTRING("test-load"));
-
-  load->LoadFromFile(file);
-
-  DoExpectedLookup(load, array);
-
-  DoRandomLookup(load, 1000, array);
-
-  CheckContent(load, map);
-
-  file->Remove(false);
-}
-
-// Test save then load prefix with both 4 bytes prefixes and 5~32 bytes prefixes
-TEST(VariableLengthPrefixSet, LoadSavePrefixSet)
-{
-  RefPtr<VariableLengthPrefixSet> save = new VariableLengthPrefixSet;
-  save->Init(NS_LITERAL_CSTRING("test-save"));
-
-  // Try to simulate the real case that most prefixes are 4bytes
-  _PrefixArray array;
-  RandomPrefixes(20000, 4, 4, array);
-  RandomPrefixes(1000, 5, 32, array);
-
-  PrefixStringMap map;
-  SetupPrefixMap(array, map);
-  save->SetPrefixes(map);
-
-  DoExpectedLookup(save, array);
-
-  DoRandomLookup(save, 1000, array);
-
-  CheckContent(save, map);
-
-  nsCOMPtr<nsIFile> file;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                         getter_AddRefs(file));
-  file->Append(NS_LITERAL_STRING("test.vlpset"));
-
-  save->StoreToFile(file);
-
-  RefPtr<VariableLengthPrefixSet> load = new VariableLengthPrefixSet;
-  load->Init(NS_LITERAL_CSTRING("test-load"));
-
-  load->LoadFromFile(file);
-
-  DoExpectedLookup(load, array);
-
-  DoRandomLookup(load, 1000, array);
-
-  CheckContent(load, map);
-
-  file->Remove(false);
-}
diff --git a/toolkit/components/url-classifier/tests/gtest/moz.build b/toolkit/components/url-classifier/tests/gtest/moz.build
index 5e4d66a9a79e..39f216446e85 100644
--- a/toolkit/components/url-classifier/tests/gtest/moz.build
+++ b/toolkit/components/url-classifier/tests/gtest/moz.build
@@ -14,9 +14,7 @@ UNIFIED_SOURCES += [
     'TestSafebrowsingHash.cpp',
     'TestSafeBrowsingProtobuf.cpp',
     'TestTable.cpp',
-    'TestUrlClassifierTableUpdateV4.cpp',
     'TestUrlClassifierUtils.cpp',
-    'TestVariableLengthPrefixSet.cpp',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'

From 61774199923eff8cb3703a12a31a7e629ca4dd10 Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@mozilla.com>
Date: Thu, 29 Sep 2016 19:38:08 -0700
Subject: [PATCH 52/57] Bug 1306492 - release staging directory when add-on
 install is postponed r=kmag

MozReview-Commit-ID: 3mMFS2l8bKq

--HG--
extra : rebase_source : 31048819e830e79db468a39e1ce1cfb2e5d0fa66
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm         | 1 +
 .../test/xpcshell/test_delay_update_webextension.js         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 52fe64e649a8..71010d622516 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -6273,6 +6273,7 @@ AddonInstall.prototype = {
                   case AddonManager.STATE_POSTPONED:
                     logger.info(`${this.addon.id} has resumed a previously postponed upgrade`);
                     this.state = AddonManager.STATE_DOWNLOADED;
+                    this.installLocation.releaseStagingDir();
                     this.install();
                     break;
                   default:
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js b/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
index 118f66e4ca7b..cc5ede455fae 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
@@ -12,6 +12,8 @@ Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 const tempdir = gTmpD.clone();
+const stageDir = profileDir.clone();
+stageDir.append("staged");
 
 const IGNORE_ID = "test_delay_update_ignore_webext@tests.mozilla.org";
 const COMPLETE_ID = "test_delay_update_complete_webext@tests.mozilla.org";
@@ -177,6 +179,10 @@ add_task(function* delay_updates_complete() {
   do_check_true(addon_allowed.isActive);
   do_check_eq(addon_allowed.type, "extension");
 
+  if (stageDir.exists()) {
+    do_throw("Staging directory should not exist for formerly-postponed extension");
+  }
+
   yield extension.markUnloaded();
   yield addon_allowed.uninstall();
   yield promiseShutdownManager();

From e5be6e71b31f18fa684185a6cb60b8084b6b371b Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Mon, 3 Oct 2016 14:02:15 -0700
Subject: [PATCH 53/57] Bug 1307223 - Don't warning multiple times about WMF
 dlls failing to load. r=cpearce

We already report failure in |LoadDlls| on the initial failure to load, there's
no need to warn more than once per session.

MozReview-Commit-ID: FhsR2ZaMSLT

--HG--
extra : rebase_source : ae7d94af5c9d9253b82b2d45dc6967b5b21c6492
---
 dom/media/platforms/wmf/WMFUtils.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dom/media/platforms/wmf/WMFUtils.cpp b/dom/media/platforms/wmf/WMFUtils.cpp
index 8255a965668a..23e8b513b4d8 100644
--- a/dom/media/platforms/wmf/WMFUtils.cpp
+++ b/dom/media/platforms/wmf/WMFUtils.cpp
@@ -203,7 +203,9 @@ HRESULT
 MFStartup()
 {
   HRESULT hr = LoadDLLs();
-  NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
+  if (FAILED(hr)) {
+    return hr;
+  }
 
   const int MF_VISTA_VERSION = (0x0001 << 16 | MF_API_VERSION);
   const int MF_WIN7_VERSION = (0x0002 << 16 | MF_API_VERSION);

From 6f030a66947435e20d70c455cdea3ed9ccca62c8 Mon Sep 17 00:00:00 2001
From: "Nils Ohlmeier [:drno]" <drno@ohlmeier.org>
Date: Fri, 30 Sep 2016 16:49:26 -0700
Subject: [PATCH 54/57] Bug 1306782: remove B2G from WebRTC mochitest.ini.
 r=dminor

MozReview-Commit-ID: LACslRHbQFp

--HG--
extra : rebase_source : ab1fd30345073e3b07499bcaf09f2e806ba4c8bc
---
 dom/media/tests/mochitest/mochitest.ini | 202 ++++++++++--------------
 1 file changed, 80 insertions(+), 122 deletions(-)

diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index a602e8d838ff..bbd64e5d80f3 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 tags = msg webrtc
 subsuite = media
-skip-if = (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
+skip-if = (buildapp == 'mulet') || (toolkit == 'gonk') # b2g (bug 1306391)
 support-files =
   head.js
   dataChannel.js
@@ -25,55 +25,47 @@ support-files =
 
 [test_a_noOp.html]
 [test_dataChannel_basicAudio.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # Bug 962984 for debug, bug 963244 for opt
+skip-if = (android_version == '18' && debug) # Bug 962984 for debug, bug 963244 for opt
 [test_dataChannel_basicAudioVideo.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_basicAudioVideoNoBundle.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) FAILS WHEN RUN MANUALLY ON AWS, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_basicAudioVideoCombined.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_basicDataOnly.html]
 [test_dataChannel_basicVideo.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_bug1013809.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g emulator seems to be too slow (Bug 1016498 and 1008080)
 [test_dataChannel_noOffer.html]
 [test_enumerateDevices.html]
-skip-if = buildapp == 'mulet'
 [test_ondevicechange.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || os == 'win' || os == 'android'
+skip-if = os == 'win' || os == 'android'
 [test_getUserMedia_audioCapture.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g emulator seems to be too slow (Bug 1016498 and 1008080), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_getUserMedia_addTrackRemoveTrack.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_addtrack_removetrack_events.html]
 [test_getUserMedia_basicAudio.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicVideo.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicVideo_playAfterLoadedmetadata.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicScreenshare.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # no screenshare on b2g/android # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' # no screenshare on android
 [test_getUserMedia_basicTabshare.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # no windowshare on b2g/android # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' # no windowshare on android
 [test_getUserMedia_basicWindowshare.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # no windowshare on b2g/android # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' # no windowshare on android
 [test_getUserMedia_basicVideoAudio.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure, turned an intermittent (bug 962579) into a permanant orange
 [test_getUserMedia_bug1223696.html]
 [test_getUserMedia_constraints.html]
 [test_getUserMedia_callbacks.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # Bug 1063290, intermittent timeout # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_getUserMedia_getTrackById.html]
 [test_getUserMedia_gumWithinGum.html]
 [test_getUserMedia_loadedmetadata.html]
 [test_getUserMedia_mediaElementCapture_audio.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g emulator seems to be too slow (Bug 1016498 and 1008080), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_getUserMedia_mediaElementCapture_tracks.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g emulator seems to be too slow (Bug 1016498 and 1008080), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_getUserMedia_mediaElementCapture_video.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g emulator seems to be too slow (Bug 1016498 and 1008080), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_getUserMedia_mediaStreamClone.html]
 [test_getUserMedia_mediaStreamConstructors.html]
 [test_getUserMedia_mediaStreamTrackClone.html]
@@ -81,7 +73,6 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' #
 [test_getUserMedia_playVideoAudioTwice.html]
 [test_getUserMedia_playVideoTwice.html]
 [test_getUserMedia_spinEventLoop.html]
-skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # copied from basicAudio
 [test_getUserMedia_stopAudioStream.html]
 [test_getUserMedia_stopAudioStreamWithFollowupAudio.html]
 [test_getUserMedia_stopVideoAudioStream.html]
@@ -90,206 +81,173 @@ skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # copied from basi
 [test_getUserMedia_stopVideoStreamWithFollowupVideo.html]
 [test_getUserMedia_trackEnded.html]
 [test_getUserMedia_peerIdentity.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 1021776, too --ing slow on b2g)
 [test_peerConnection_addIceCandidate.html]
 [test_peerConnection_addtrack_removetrack_events.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudio.html]
-skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_basicAudioNATSrflx.html]
-skip-if = toolkit == 'gonk' || toolkit == 'android' # B2G emulator is too slow to handle a two-way audio call reliably, websockets don't work on android (bug 1266217)
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioNATRelay.html]
-skip-if = toolkit == 'gonk' || toolkit == 'android' # B2G emulator is too slow to handle a two-way audio call reliably, websockets don't work on android (bug 1266217)
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioNATRelayTCP.html]
-skip-if = toolkit == 'gonk' || toolkit == 'android' # B2G emulator is too slow to handle a two-way audio call reliably, websockets don't work on android (bug 1266217)
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioRequireEOC.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_basicAudioPcmaPcmuOnly.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g (Bug 1059867)
+skip-if = android_version == '18' # b2g (Bug 1059867)
 [test_peerConnection_basicAudioDynamicPtMissingRtpmap.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_basicAudioVideo.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoCombined.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoNoBundle.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoNoBundleNoRtcpMux.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoNoRtcpMux.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicVideo.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicScreenshare.html]
-# no screenshare on b2g/android
 # frequent timeouts/crashes on e10s (bug 1048455)
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' # no screenshare on android
 [test_peerConnection_basicWindowshare.html]
-# no screenshare on b2g/android
 # frequent timeouts/crashes on e10s (bug 1048455)
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = toolkit == 'android' # no screenshare on android
 [test_peerConnection_basicH264Video.html]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || os == 'android' # bug 1043403 # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = os == 'android' # bug 1043403
 [test_peerConnection_bug822674.html]
 [test_peerConnection_bug825703.html]
 [test_peerConnection_bug827843.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_bug834153.html]
 [test_peerConnection_bug1013809.html]
-skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_bug1042791.html]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' || os == 'android' # bug 1043403 # Bug 1141029 Mulet parity with B2G Desktop for TC
+skip-if = os == 'android' # bug 1043403
 [test_peerConnection_bug1064223.html]
 [test_peerConnection_capturedVideo.html]
 tags=capturestream
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_2d.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_multiple_captureStream_canvas_2d.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_webgl.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 # [test_peerConnection_certificates.html] # bug 1180968
-# skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_close.html]
 [test_peerConnection_closeDuringIce.html]
 [test_peerConnection_constructedStream.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_errorCallbacks.html]
 [test_peerConnection_iceFailure.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || os == 'linux' || os == 'mac' || os == 'win' || android_version == '18' # Disabling because of test failures on B2G emulator (Bug 1180388 for win, mac and linux), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = os == 'linux' || os == 'mac' || os == 'win' || android_version == '18' # (Bug 1180388 for win, mac and linux), android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_forwarding_basicAudioVideoCombined.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_noTrickleAnswer.html]
-skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_noTrickleOffer.html]
-skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_noTrickleOfferAnswer.html]
-skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_offerRequiresReceiveAudio.html]
 [test_peerConnection_offerRequiresReceiveVideo.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_offerRequiresReceiveVideoAudio.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_promiseSendOnly.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_renderAfterRenegotiation.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_restartIce.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_restartIceNoBundle.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_restartIceNoBundleNoRtcpMux.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_restartIceNoRtcpMux.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_restartIceLocalRollback.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_restartIceLocalAndRemoteRollback.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g (Bug 1059867)
+skip-if = android_version
 [test_peerConnection_scaleResolution.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18') # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_simulcastOffer.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version # b2g(Bug 960442, video support for WebRTC is disabled on b2g), no simulcast support on android
+skip-if = android_version # no simulcast support on android
 #[test_peerConnection_relayOnly.html]
-#skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_callbacks.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_replaceTrack.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_syncSetDescription.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_setLocalAnswerInHaveLocalOffer.html]
 [test_peerConnection_setLocalAnswerInStable.html]
 [test_peerConnection_setLocalOfferInHaveRemoteOffer.html]
 [test_peerConnection_setParameters.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18') # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html]
 [test_peerConnection_setRemoteAnswerInStable.html]
 [test_peerConnection_setRemoteOfferInHaveLocalOffer.html]
 [test_peerConnection_throwInCallbacks.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_toJSON.html]
 [test_peerConnection_trackDisabling_clones.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_trackDisabling.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioStreams.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioTracksInOneStream.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioVideoStreams.html]
-# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1171255 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (os == 'linux' && debug && e10s) || android_version == '18'
+skip-if = (os == 'linux' && debug && e10s) || android_version == '18' # Bug 1171255 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioVideoStreamsCombined.html]
-# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1127828 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (os == 'linux' && debug && e10s) || android_version == '18'
+skip-if = (os == 'linux' && debug && e10s) || android_version == '18' # Bug 1127828 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoVideoStreams.html]
-# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoVideoTracksInOneStream.html]
-# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || os == "android"
+skip-if = os == "android" # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addAudioTrackToExistingVideoStream.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addSecondAudioStream.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes
+skip-if = (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes
 [test_peerConnection_answererAddSecondAudioStream.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes
+skip-if = (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes
 [test_peerConnection_removeAudioTrack.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_removeThenAddAudioTrack.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addSecondVideoStream.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_removeVideoTrack.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_removeThenAddVideoTrack.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_replaceVideoThenRenegotiate.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addSecondAudioStreamNoBundle.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # B2G emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_removeThenAddAudioTrackNoBundle.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # B2G emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addSecondVideoStreamNoBundle.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_removeThenAddVideoTrackNoBundle.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addDataChannel.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # emulator seems to be so slow that DTLS cannot establish properly, android(bug 1240256, intermittent ICE failures starting w/bug 1232082, possibly from timeout)
+skip-if = (android_version == '18' && debug) # android(bug 1240256, intermittent ICE failures starting w/bug 1232082, possibly from timeout)
 [test_peerConnection_addDataChannelNoBundle.html]
-# b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # b2g(emulator seems to be so slow that DTLS cannot establish properly), android(bug 1240256, intermittent ICE failures starting w/bug 1232082, possibly from timeout)
+skip-if = (android_version == '18' && debug) # android(bug 1240256, intermittent ICE failures starting w/bug 1232082, possibly from timeout) android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_verifyAudioAfterRenegotiation.html]
-skip-if = toolkit == 'gonk' || android_version == '18' # B2G emulator is too slow to finish a renegotiation test in under 5 minutes, android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_verifyVideoAfterRenegotiation.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_audioRenegotiationInactiveAnswer.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_videoRenegotiationInactiveAnswer.html]
-# B2G emulator is too slow to finish a renegotiation test in under 5 minutes, Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
-skip-if = toolkit == 'gonk' || android_version == '18'
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_webAudio.html]
 tags = webaudio webrtc
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_localRollback.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_localReofferRollback.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g (Bug 1059867)
 [test_peerConnection_remoteRollback.html]
-skip-if = toolkit == 'gonk' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_remoteReofferRollback.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator)
+skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_selftest.html]
 # Bug 1227781: Crash with bogus TURN server.
 [test_peerConnection_bug1227781.html]

From fa923858751f1e36a9ce89cc41de5c7ebd49f8f9 Mon Sep 17 00:00:00 2001
From: Jan Odvarko <odvarko@gmail.com>
Date: Mon, 3 Oct 2016 18:14:14 +0200
Subject: [PATCH 55/57] Bug 1305979 - Test for addSidebarTab API. r=jdescottes

---
 devtools/client/inspector/test/browser.ini    |  1 +
 .../test/browser_inspector_addSidebarTab.js   | 62 +++++++++++++++++++
 .../client/shared/components/tabs/tabbar.js   |  6 +-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 devtools/client/inspector/test/browser_inspector_addSidebarTab.js

diff --git a/devtools/client/inspector/test/browser.ini b/devtools/client/inspector/test/browser.ini
index bad36adabf34..fa9cb95c277a 100644
--- a/devtools/client/inspector/test/browser.ini
+++ b/devtools/client/inspector/test/browser.ini
@@ -45,6 +45,7 @@ support-files =
 [browser_inspector_addNode_01.js]
 [browser_inspector_addNode_02.js]
 [browser_inspector_addNode_03.js]
+[browser_inspector_addSidebarTab.js]
 [browser_inspector_breadcrumbs.js]
 [browser_inspector_breadcrumbs_highlight_hover.js]
 [browser_inspector_breadcrumbs_keybinding.js]
diff --git a/devtools/client/inspector/test/browser_inspector_addSidebarTab.js b/devtools/client/inspector/test/browser_inspector_addSidebarTab.js
new file mode 100644
index 000000000000..77dc2632e6ea
--- /dev/null
+++ b/devtools/client/inspector/test/browser_inspector_addSidebarTab.js
@@ -0,0 +1,62 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+const TEST_URI = "data:text/html;charset=UTF-8," +
+  "<h1>browser_inspector_addtabbar.js</h1>";
+
+const CONTENT_TEXT = "Hello World!";
+
+/**
+ * Verify InspectorPanel.addSidebarTab() API that can be consumed
+ * by DevTools extensions as well as DevTools code base.
+ */
+add_task(function* () {
+  let { inspector } = yield openInspectorForURL(TEST_URI);
+
+  const React = inspector.React;
+  const { div } = React.DOM;
+
+  info("Adding custom panel.");
+
+  // Define custom side-panel.
+  let tabPanel = React.createFactory(React.createClass({
+    displayName: "myTabPanel",
+    render: function () {
+      return (
+        div({className: "my-tab-panel"},
+          CONTENT_TEXT
+        )
+      );
+    }
+  }));
+
+  // Append custom panel (tab) into the Inspector panel and
+  // make sure it's selected by default (the last arg = true).
+  inspector.addSidebarTab("myPanel", "My Panel", tabPanel, true);
+  is(inspector.sidebar.getCurrentTabID(), "myPanel",
+     "My Panel is selected by default");
+
+  // Define another custom side-panel.
+  tabPanel = React.createFactory(React.createClass({
+    displayName: "myTabPanel2",
+    render: function () {
+      return (
+        div({className: "my-tab-panel2"},
+          "Another Content"
+        )
+      );
+    }
+  }));
+
+  // Append second panel, but don't select it by default.
+  inspector.addSidebarTab("myPanel", "My Panel", tabPanel, false);
+  is(inspector.sidebar.getCurrentTabID(), "myPanel",
+     "My Panel is selected by default");
+
+  // Check the the panel content is properly rendered.
+  let tabPanelNode = inspector.panelDoc.querySelector(".my-tab-panel");
+  is(tabPanelNode.textContent, CONTENT_TEXT,
+    "Side panel content has been rendered.");
+});
diff --git a/devtools/client/shared/components/tabs/tabbar.js b/devtools/client/shared/components/tabs/tabbar.js
index 61d0556f3d0d..1e3aa4617e5d 100644
--- a/devtools/client/shared/components/tabs/tabbar.js
+++ b/devtools/client/shared/components/tabs/tabbar.js
@@ -54,7 +54,11 @@ let Tabbar = createClass({
       newState.activeTab = tabs.length - 1;
     }
 
-    this.setState(newState);
+    this.setState(newState, () => {
+      if (this.props.onSelect && selected) {
+        this.props.onSelect(id);
+      }
+    });
   },
 
   toggleTab: function (tabId, isVisible) {

From 7d2a059d0d290c378bb1e3cd90d9f2c640d5ffe3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 3 Oct 2016 20:44:28 +0100
Subject: [PATCH 56/57] Bug 1278687: Multiplex extension message listeners for
 use in chrome tests. r=aswan

MozReview-Commit-ID: 3V5FqnBQy1j

--HG--
extra : rebase_source : 84fd9c3a83e6cc0acf2f93421d9903fc45587988
---
 .../specialpowers/content/specialpowersAPI.js | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 3daf050a30dd..054dc7fb3e12 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1945,7 +1945,23 @@ SpecialPowersAPI.prototype = {
   },
 
   _nextExtensionID: 0,
+  _extensionListeners: null,
+
   loadExtension: function(ext, handler) {
+    if (this._extensionListeners == null) {
+      this._extensionListeners = new Set();
+
+      this._addMessageListener("SPExtensionMessage", msg => {
+        for (let listener of this._extensionListeners) {
+          try {
+            listener(msg);
+          } catch (e) {
+            Cu.reportError(e);
+          }
+        }
+      });
+    }
+
     // Note, this is not the addon is as used by the AddonManager etc,
     // this is just an identifier used for specialpowers messaging
     // between this content process and the chrome process.
@@ -1959,7 +1975,7 @@ SpecialPowersAPI.prototype = {
     let unloadPromise = new Promise(resolve => { resolveUnload = resolve; });
 
     startupPromise.catch(() => {
-      this._removeMessageListener("SPExtensionMessage", listener);
+      this._extensionListeners.delete(listener);
     });
 
     handler = Cu.waiveXrays(handler);
@@ -2000,7 +2016,7 @@ SpecialPowersAPI.prototype = {
           state = "failed";
           rejectStartup("startup failed");
         } else if (msg.data.type == "extensionUnloaded") {
-          this._removeMessageListener("SPExtensionMessage", listener);
+          this._extensionListeners.delete(listener);
           state = "unloaded";
           resolveUnload();
         } else if (msg.data.type in handler) {
@@ -2011,7 +2027,7 @@ SpecialPowersAPI.prototype = {
       }
     };
 
-    this._addMessageListener("SPExtensionMessage", listener);
+    this._extensionListeners.add(listener);
     return extension;
   },
 

From 31b75f45371e884c4b53596bce199d125f1caf3f Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 3 Oct 2016 20:17:28 -0700
Subject: [PATCH 57/57] Backed out changeset b26e668306fb (bug 1278687) for
 making test_ext_webrequest.html between near-permaorange and
 actual-permaorange

---
 .../specialpowers/content/specialpowersAPI.js | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 054dc7fb3e12..3daf050a30dd 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1945,23 +1945,7 @@ SpecialPowersAPI.prototype = {
   },
 
   _nextExtensionID: 0,
-  _extensionListeners: null,
-
   loadExtension: function(ext, handler) {
-    if (this._extensionListeners == null) {
-      this._extensionListeners = new Set();
-
-      this._addMessageListener("SPExtensionMessage", msg => {
-        for (let listener of this._extensionListeners) {
-          try {
-            listener(msg);
-          } catch (e) {
-            Cu.reportError(e);
-          }
-        }
-      });
-    }
-
     // Note, this is not the addon is as used by the AddonManager etc,
     // this is just an identifier used for specialpowers messaging
     // between this content process and the chrome process.
@@ -1975,7 +1959,7 @@ SpecialPowersAPI.prototype = {
     let unloadPromise = new Promise(resolve => { resolveUnload = resolve; });
 
     startupPromise.catch(() => {
-      this._extensionListeners.delete(listener);
+      this._removeMessageListener("SPExtensionMessage", listener);
     });
 
     handler = Cu.waiveXrays(handler);
@@ -2016,7 +2000,7 @@ SpecialPowersAPI.prototype = {
           state = "failed";
           rejectStartup("startup failed");
         } else if (msg.data.type == "extensionUnloaded") {
-          this._extensionListeners.delete(listener);
+          this._removeMessageListener("SPExtensionMessage", listener);
           state = "unloaded";
           resolveUnload();
         } else if (msg.data.type in handler) {
@@ -2027,7 +2011,7 @@ SpecialPowersAPI.prototype = {
       }
     };
 
-    this._extensionListeners.add(listener);
+    this._addMessageListener("SPExtensionMessage", listener);
     return extension;
   },