Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

2 files changed, 24 insertions, 0 deletions

diff --git a/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini b/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini
new file mode 100644
index 000000000..628520b23
--- /dev/null
+++ b/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini
@@ -0,0 +1,6 @@
+[DEFAULT]
+subsuite = screenshots
+support-files =
+  ../head.js
+
+[browser_primaryUI.js]
diff --git a/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js b/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js
new file mode 100644
index 000000000..6d0eaa1d6
--- /dev/null
+++ b/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js
@@ -0,0 +1,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/. */
+
+/* import-globals-from ../head.js */
+
+"use strict";
+
+add_task(function* capture() {
+  if (!shouldCapture()) {
+    return;
+  }
+
+  requestLongerTimeout(20);
+
+  let sets = ["TabsInTitlebar", "Tabs", "WindowSize", "Toolbars", "LightweightThemes"];
+  yield TestRunner.start(sets, "primaryUI");
+});