Merge mozilla-inbound to mozilla-central. a=merge

UltraBlame original commit: 0d4e73bc2cd705d7a021c75a0e8aeb174ab4db59
marco-c · Oct 3, 2019 · 2de9461 · 2de9461
1 parent 8d44a7f
commit 2de9461
Show file tree

Hide file tree

Showing 3 changed files with 458 additions and 19 deletions.
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -5430,9 +5430,6 @@ endif
 /
 Tabbed
 browser
-#
-ifdef
-EARLY_BETA_OR_EARLIER
 pref
 (
 "
@@ -5445,22 +5442,6 @@ multiselect
 true
 )
 ;
-#
-else
-pref
-(
-"
-browser
-.
-tabs
-.
-multiselect
-"
-false
-)
-;
-#
-endif
 pref
 (
 "
@@ -15519,6 +15500,64 @@ com
 ;
 /
 /
+The
+pref
+that
+controls
+if
+the
+search
+shortcuts
+experiment
+is
+on
+#
+ifdef
+EARLY_BETA_OR_EARLIER
+pref
+(
+"
+browser
+.
+newtabpage
+.
+activity
+-
+stream
+.
+improvesearch
+.
+topSiteSearchShortcuts
+"
+true
+)
+;
+#
+else
+pref
+(
+"
+browser
+.
+newtabpage
+.
+activity
+-
+stream
+.
+improvesearch
+.
+topSiteSearchShortcuts
+"
+false
+)
+;
+#
+else
+#
+endif
+/
+/
 Enable
 the
 DOM

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
@@ -1095,6 +1095,14 @@ tests
 -
 reftests
 -
+web
+-
+platform
+-
+tests
+-
+wdspec
+-
 xpcshell
 windows
 -
-Original file line number
+Diff line change
@@ Expand Up / @@ -1095,6 +1095,14 @@ tests @@
     -
     reftests
     -
+    web
+    -
+    platform
+    -
+    tests
+    -
+    wdspec
+    -
     xpcshell
     windows
     -
@@ Expand Down @@