From 2de94619437146a860fe464b8776129f3e1a5d7e Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Thu, 3 Oct 2019 14:06:07 +0000
Subject: [PATCH] Merge mozilla-inbound to mozilla-central. a=merge

UltraBlame original commit: 0d4e73bc2cd705d7a021c75a0e8aeb174ab4db59
---
 browser/app/profile/firefox.js            |  77 +++--
 taskcluster/ci/test/test-sets.yml         |   8 +
 taskcluster/taskgraph/transforms/tests.py | 392 ++++++++++++++++++++++
 3 files changed, 458 insertions(+), 19 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 79768421f2e90..e4cb8e0e0251e 100644
--- 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
index 8c3ad1be806e4..9799063d64678 100644
--- 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
 -
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index 9a2c8b443b574..b6d95bfc49251 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -211,6 +211,14 @@
 .
 util
 .
+attributes
+import
+match_run_on_projects
+from
+taskgraph
+.
+util
+.
 schema
 import
 resolve_keyed_by
@@ -2078,6 +2086,94 @@
 :
 basestring
     
+#
+Whether
+to
+run
+this
+task
+with
+the
+serviceworker
+e10s
+redesign
+enabled
+    
+#
+(
+desktop
+-
+test
+only
+)
+.
+If
+'
+both
+'
+run
+one
+task
+with
+and
+one
+task
+without
+.
+    
+#
+Tasks
+with
+this
+enabled
+have
+have
+"
+-
+sw
+"
+appended
+to
+the
+test
+name
+and
+    
+#
+treeherder
+group
+.
+    
+Optional
+(
+'
+serviceworker
+-
+e10s
+'
+)
+:
+optionally_keyed_by
+(
+        
+'
+test
+-
+platform
+'
+'
+project
+'
+        
+Any
+(
+bool
+'
+both
+'
+)
+)
+    
 #
 Whether
 to
@@ -4367,6 +4463,18 @@
 False
 )
         
+test
+.
+setdefault
+(
+'
+serviceworker
+-
+e10s
+'
+False
+)
+        
 test
 [
 '
@@ -6537,6 +6645,12 @@
 chunks
 '
         
+'
+serviceworker
+-
+e10s
+'
+        
 '
 e10s
 '
@@ -8041,6 +8155,284 @@
 ]
 )
         
+yield
+test
+transforms
+.
+add
+def
+split_serviceworker_e10s
+(
+config
+tests
+)
+:
+    
+for
+test
+in
+tests
+:
+        
+sw
+=
+test
+.
+pop
+(
+'
+serviceworker
+-
+e10s
+'
+)
+        
+test
+[
+'
+serviceworker
+-
+e10s
+'
+]
+=
+False
+        
+test
+[
+'
+attributes
+'
+]
+[
+'
+serviceworker_e10s
+'
+]
+=
+False
+        
+if
+sw
+=
+=
+'
+both
+'
+:
+            
+yield
+copy
+.
+deepcopy
+(
+test
+)
+            
+sw
+=
+True
+        
+if
+sw
+:
+            
+if
+not
+match_run_on_projects
+(
+'
+mozilla
+-
+central
+'
+test
+[
+'
+run
+-
+on
+-
+projects
+'
+]
+)
+:
+                
+continue
+            
+test
+[
+'
+description
+'
+]
++
+=
+"
+with
+serviceworker
+-
+e10s
+redesign
+enabled
+"
+            
+test
+[
+'
+run
+-
+on
+-
+projects
+'
+]
+=
+[
+'
+mozilla
+-
+central
+'
+]
+            
+test
+[
+'
+test
+-
+name
+'
+]
++
+=
+'
+-
+sw
+'
+            
+test
+[
+'
+try
+-
+name
+'
+]
++
+=
+'
+-
+sw
+'
+            
+test
+[
+'
+attributes
+'
+]
+[
+'
+serviceworker_e10s
+'
+]
+=
+True
+            
+group
+symbol
+=
+split_symbol
+(
+test
+[
+'
+treeherder
+-
+symbol
+'
+]
+)
+            
+if
+group
+!
+=
+'
+?
+'
+:
+                
+group
++
+=
+'
+-
+sw
+'
+            
+else
+:
+                
+symbol
++
+=
+'
+-
+sw
+'
+            
+test
+[
+'
+treeherder
+-
+symbol
+'
+]
+=
+join_symbol
+(
+group
+symbol
+)
+            
+test
+[
+'
+mozharness
+'
+]
+[
+'
+extra
+-
+options
+'
+]
+.
+append
+(
+                
+'
+-
+-
+setpref
+=
+"
+dom
+.
+serviceWorkers
+.
+parent_intercept
+=
+true
+"
+'
+)
+        
 yield
 test
 transforms