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

2019-06-21 19:18:24 +03:00 · 2019-06-21 19:18:24 +03:00 · 7eb69b5a5b
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@ -42,7 +42,7 @@ endif # WINNT
 ifndef INCLUDED_AUTOCONF_MK
 default::
 else
-TIERS := $(if $(MOZ_ARTIFACT_BUILDS),artifact )$(if $(MOZ_EME_WIN32_ARTIFACT),win32-artifact )$(if $(MOZ_ANDROID_FAT_AAR_ARCHITECTURES),android-fat-aar-artifact )pre-export export $(if $(COMPILE_ENVIRONMENT),compile )misc libs tools$(if $(filter check recurse_check,$(MAKECMDGOALS)), check)
+TIERS := $(if $(MOZ_ARTIFACT_BUILDS),artifact )$(if $(MOZ_EME_WIN32_ARTIFACT),win32-artifact )$(if $(MOZ_ANDROID_FAT_AAR_ARCHITECTURES),android-fat-aar-artifact )pre-export export $(if $(COMPILE_ENVIRONMENT),$(if $(MOZ_RUST_TIER),rust )compile )misc libs tools$(if $(filter check recurse_check,$(MAKECMDGOALS)), check)
 endif

 # These defines are used to support the twin-topsrcdir model for comm-central.
--- a/config/config.mk
+++ b/config/config.mk
@ -437,3 +437,8 @@ endif
 endif

 PLY_INCLUDE = -I$(MOZILLA_DIR)/other-licenses/ply
+
+# Enable verbose logs when not using `make -s`
+ifeq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS))))
+BUILD_VERBOSE_LOG = 1
+endif
--- a/config/rules.mk
+++ b/config/rules.mk
@ -46,7 +46,7 @@ EXEC			= exec
 # ELOG prints out failed command when building silently (gmake -s). Pymake
 # prints out failed commands anyway, so ELOG just makes things worse by
 # forcing shell invocations.
-ifneq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS))))
+ifndef BUILD_VERBOSE_LOG
  ELOG := $(EXEC) sh $(MOZILLA_DIR)/build/unix/print-failed-commands.sh
 else
  ELOG :=
--- a/devtools/docs/tests/mochitest-devtools.md
+++ b/devtools/docs/tests/mochitest-devtools.md
@ -21,5 +21,16 @@ To run a specific DevTools mochitest:
 ```bash
 ./mach mochitest devtools/client/path/to/the/test_you_want_to_run.js
 ```
-Note that the mochitests *must* have focus while running.
+Note that the mochitests *must* have focus while running. The tests run in the browser which looks like someone is magically testing your code by hand. If the browser loses focus, the tests will stop and fail after some time. (Again, sit back and relax)

+In case you'd like to run the mochitests without having to care about focus and be able to touch your computer while running:
+
+```bash
+./mach mochitest --headless devtools/client/<tool>
+```
+
+You can also run just a single test:
+
+```bash
+./mach mochitest --headless devtools/client/path/to/the/test_you_want_to_run.js
+```
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@ -21,7 +21,8 @@
 #   * concrete - Indicates whether there exist JS objects with this interface as
 #                their primary interface (and hence whose prototype is this
 #                interface's prototype object).  Always False for callback
-#                interfaces.  Defaults to True otherwise.
+#                interfaces.  Defaults to True for leaf interfaces and
+#                interfaces with constructors, false otherwise.
 #   * notflattened - The native type does not have nsIClassInfo, so when
 #                    wrapping it the right IID needs to be passed in.
 #                    Only relevant for callback interfaces.
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@ -265,11 +265,6 @@
            </intent-filter>
        </receiver>

-        <service android:name="org.mozilla.gecko.Restarter"
-                 android:exported="false"
-                 android:process="@MANGLED_ANDROID_PACKAGE_NAME@.Restarter">
-        </service>
-
        <service android:name="org.mozilla.gecko.media.MediaControlService"
                 android:exported="false"
                 android:stopWithTask="true">
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@ -1022,7 +1022,13 @@ public abstract class GeckoApp extends GeckoActivity
        // no need to touch that here.
        if (BrowserLocaleManager.getInstance().systemLocaleDidChange()) {
            Log.i(LOGTAG, "System locale changed. Restarting.");
+
+            mIsAbortingAppLaunch = true;
+
+            // Call finish() asap so that other classes would know BrowserApp isFinishing()
            finishAndShutdown(/* restart */ true);
+            super.onCreate(savedInstanceState);
+
            return;
        }

@ -2119,6 +2125,12 @@ public abstract class GeckoApp extends GeckoActivity
            // This build does not support the Android version of the device:
            // We did not initialize anything, so skip cleaning up.
            super.onDestroy();
+
+            if (mShutdownOnDestroy) {
+                GeckoApplication.shutdown(!mRestartOnShutdown ? null : new Intent(
+                        Intent.ACTION_MAIN, /* uri */ null, getApplicationContext(), getClass()));
+            }
+
            return;
        }

--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@ -153,13 +153,14 @@ public class GeckoApplication extends Application
            return;
        }

-        // Restarting, so let Restarter kill us.
+        // Actually restarting the Processs / Application.
        final Context context = GeckoAppShell.getApplicationContext();
-        final Intent intent = new Intent();
-        intent.setClass(context, Restarter.class)
-              .putExtra("pid", Process.myPid())
-              .putExtra(Intent.EXTRA_INTENT, restartIntent);
-        context.startService(intent);
+        final Intent intent = new Intent()
+                .setClassName(context, AppConstants.MOZ_ANDROID_BROWSER_INTENT_CLASS)
+                .putExtra("didRestart", true)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+        Process.killProcess(Process.myPid());
    }

    /**
--- a/mobile/android/base/java/org/mozilla/gecko/Restarter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Restarter.java
@ -1,49 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * 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/. */
-
-package org.mozilla.gecko;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.os.Process;
-import android.util.Log;
-
-public class Restarter extends Service {
-    private static final String LOGTAG = "GeckoRestarter";
-
-    private void doRestart(Intent intent) {
-        final int oldProc = intent.getIntExtra("pid", -1);
-        if (oldProc < 0) {
-            return;
-        }
-
-        Process.killProcess(oldProc);
-        Log.d(LOGTAG, "Killed " + oldProc);
-        try {
-            Thread.sleep(100);
-        } catch (final InterruptedException e) {
-        }
-
-        final Intent restartIntent = (Intent)intent.getParcelableExtra(Intent.EXTRA_INTENT);
-        restartIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                     .putExtra("didRestart", true)
-                     .setPackage(getApplicationContext().getPackageName());
-        startActivity(restartIntent);
-        Log.d(LOGTAG, "Launched " + restartIntent);
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        doRestart(intent);
-        stopSelf(startId);
-        return Service.START_NOT_STICKY;
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}
--- a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
@ -14,6 +14,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.UiThread;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.SwipeRefreshLayout;
@ -112,6 +113,15 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
    public void onCreate(Bundle savedInstance) {
        super.onCreate(savedInstance);

+        // BrowserApp's super.onCreate() as a FragmentActivity would dispatchCreate()
+        // for all fragments in it's savedInstanceState. This Fragment will be created.
+        // When BrowserApp does not complete it's onCreate() - like when finishing early and restarting
+        // our onCreate would try to access not yet initialized resources and would get a NPE.
+        final FragmentActivity parent = getActivity();
+        if (parent != null && parent.isFinishing()) {
+            return;
+        }
+
        int cachedRecentTabsCount = 0;
        if (mPanelStateChangeListener != null ) {
            cachedRecentTabsCount = mPanelStateChangeListener.getCachedRecentTabsCount();
--- a/mobile/android/base/java/org/mozilla/gecko/home/TabMenuStripLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/TabMenuStripLayout.java
@ -123,20 +123,20 @@ class TabMenuStripLayout extends ThemedLinearLayout
    }

    void onPageSelected(final int position) {
-        if (selectedView != null) {
-            selectedView.setTextColor(inactiveTextColor);
-        }
-
-        selectedView = (TextView) getChildAt(position);
-        selectedView.setTextColor(activeTextColor);
-
        // Callback to measure and draw the strip after the view is visible.
-        ViewTreeObserver vto = selectedView.getViewTreeObserver();
+        ViewTreeObserver vto = getViewTreeObserver();
        if (vto.isAlive()) {
            vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
                @Override
                public void onGlobalLayout() {
-                    selectedView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                    // let's ensure that we are calling this only once
+                    vto.removeOnGlobalLayoutListener(this);
+                    if (selectedView != null) {
+                        selectedView.setTextColor(inactiveTextColor);
+                    }
+
+                    selectedView = (TextView) getChildAt(position);
+                    selectedView.setTextColor(activeTextColor);

                    if (strip != null) {
                        boolean isLayoutRtl = ViewCompat.getLayoutDirection(selectedView) == ViewCompat.LAYOUT_DIRECTION_RTL;
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@ -401,7 +401,7 @@ class RecursiveMakeBackend(CommonBackend):

        self._traversal = RecursiveMakeTraversal()
        self._compile_graph = OrderedDefaultDict(set)
-        self._rust_dirs = set()
+        self._rust_targets = set()

        self._no_skip = {
            'export': set(),
@ -632,17 +632,17 @@ class RecursiveMakeBackend(CommonBackend):

        elif isinstance(obj, RustProgram):
            self._process_rust_program(obj, backend_file)
-            self._rust_dirs.add(obj.relobjdir)
            # Hook the program into the compile graph.
            build_target = self._build_target_for_obj(obj)
            self._compile_graph[build_target]
+            self._rust_targets.add(build_target)

        elif isinstance(obj, HostRustProgram):
            self._process_host_rust_program(obj, backend_file)
-            self._rust_dirs.add(obj.relobjdir)
            # Hook the program into the compile graph.
            build_target = self._build_target_for_obj(obj)
            self._compile_graph[build_target]
+            self._rust_targets.add(build_target)

        elif isinstance(obj, RustTests):
            self._process_rust_tests(obj, backend_file)
@ -680,13 +680,13 @@ class RecursiveMakeBackend(CommonBackend):
        elif isinstance(obj, RustLibrary):
            self.backend_input_files.add(obj.cargo_file)
            self._process_rust_library(obj, backend_file)
-            self._rust_dirs.add(obj.relobjdir)
            # No need to call _process_linked_libraries, because Rust
            # libraries are self-contained objects at this point.

            # Hook the library into the compile graph.
            build_target = self._build_target_for_obj(obj)
            self._compile_graph[build_target]
+            self._rust_targets.add(build_target)

        elif isinstance(obj, SharedLibrary):
            self._process_shared_library(obj, backend_file)
@ -820,10 +820,12 @@ class RecursiveMakeBackend(CommonBackend):
            # Directories containing rust compilations don't generally depend
            # on other directories in the tree, so putting them first here will
            # start them earlier in the build.
-            rule.add_dependencies(
-                chain((r for r in roots if mozpath.dirname(r) in self._rust_dirs),
-                      (r for r in roots if mozpath.dirname(r) not in self._rust_dirs))
-                )
+            rust_roots = [r for r in roots if r in self._rust_targets]
+            if category == 'compile' and rust_roots:
+                rust_rule = root_deps_mk.create_rule(['recurse_rust'])
+                rust_rule.add_dependencies(rust_roots)
+
+            rule.add_dependencies(chain(rust_roots, roots))
            for target, deps in sorted(graph.items()):
                if deps:
                    rule = root_deps_mk.create_rule([target])
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@ -713,8 +713,6 @@ class MozbuildObject(ProcessExecutionMixin):

        if silent:
            args.append('-s')
-        else:
-            args.append('BUILD_VERBOSE_LOG=1')

        # Print entering/leaving directory messages. Some consumers look at
        # these to measure progress.
--- a/remote/domains/parent/Browser.jsm
+++ b/remote/domains/parent/Browser.jsm
@ -12,11 +12,13 @@ const {Domain} = ChromeUtils.import("chrome://remote/content/domains/Domain.jsm"
 class Browser extends Domain {
  getVersion() {
    const { isHeadless } = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+    const { userAgent } = Cc["@mozilla.org/network/protocol;1?name=http"]
+                            .getService(Ci.nsIHttpProtocolHandler);
    return {
      protocolVersion: "1",
      product: (isHeadless ? "Headless " : "") + "Firefox",
      revision: "1",
-      userAgent: "Firefox",
+      userAgent,
      jsVersion: "1.8.5",
    };
  }
--- a/remote/test/browser/browser_cdp.js
+++ b/remote/test/browser/browser_cdp.js
@ -36,6 +36,7 @@ add_task(async function testCDP() {
  const version = await Browser.getVersion();
  const { isHeadless } = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
  is(version.product, isHeadless ? "Headless Firefox" : "Firefox", "Browser.getVersion works and depends on headless mode");
+  is(version.userAgent, window.navigator.userAgent, "Browser.getVersion().userAgent is correct");

  // receive console.log messages and print them
  Log.enable();
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@ -1276,6 +1276,270 @@ raptor-tp6m-14-fenix-cold:
            - --binary-path=org.mozilla.fenix.performancetest
            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity

+raptor-tp6m-15-fenix-cold:
+    description: "Raptor tp6m-15 cold page-load on Fenix"
+    try-name: raptor-tp6m-15-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-15)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-15
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-16-fenix-cold:
+    description: "Raptor tp6m-16 cold page-load on Fenix"
+    try-name: raptor-tp6m-16-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-16)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-16
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-17-fenix-cold:
+    description: "Raptor tp6m-17 cold page-load on Fenix"
+    try-name: raptor-tp6m-17-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-17)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-17
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-18-fenix-cold:
+    description: "Raptor tp6m-18 cold page-load on Fenix"
+    try-name: raptor-tp6m-18-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-18)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-18
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-19-fenix-cold:
+    description: "Raptor tp6m-19 cold page-load on Fenix"
+    try-name: raptor-tp6m-19-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-19)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-19
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-20-fenix-cold:
+    description: "Raptor tp6m-20 cold page-load on Fenix"
+    try-name: raptor-tp6m-20-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-20)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-20
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-21-fenix-cold:
+    description: "Raptor tp6m-21 cold page-load on Fenix"
+    try-name: raptor-tp6m-21-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-21)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-21
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-22-fenix-cold:
+    description: "Raptor tp6m-22 cold page-load on Fenix"
+    try-name: raptor-tp6m-22-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-22)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-22
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-23-fenix-cold:
+    description: "Raptor tp6m-23 cold page-load on Fenix"
+    try-name: raptor-tp6m-23-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-23)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-23
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-24-fenix-cold:
+    description: "Raptor tp6m-24 cold page-load on Fenix"
+    try-name: raptor-tp6m-24-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-24)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-24
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-25-fenix-cold:
+    description: "Raptor tp6m-25 cold page-load on Fenix"
+    try-name: raptor-tp6m-25-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-25)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-25
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
+raptor-tp6m-26-fenix-cold:
+    description: "Raptor tp6m-26 cold page-load on Fenix"
+    try-name: raptor-tp6m-26-fenix-cold
+    treeherder-symbol: Rap-fenix(tp6m-c-26)
+    run-on-projects: ['try']
+    e10s: true
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.fenix.v2.performance-test.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.fenix.v2.performance-test.latest.arm
+                name: target.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-26
+            - --app=fenix
+            - --binary-path=org.mozilla.fenix.performancetest
+            - --activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity
+
 raptor-speedometer-firefox:
    description: "Raptor Speedometer on Firefox"
    variants: ["fission"]
@ -2250,6 +2514,279 @@ raptor-tp6m-13-geckoview-cold:
            - --binary=org.mozilla.geckoview_example
            - --activity=org.mozilla.geckoview_example.GeckoViewActivity

+raptor-tp6m-14-geckoview-cold:
+    description: "Raptor tp6m-14 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-14-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-14)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-14
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-15-geckoview-cold:
+    description: "Raptor tp6m-15 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-15-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-15)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-15
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-16-geckoview-cold:
+    description: "Raptor tp6m-16 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-16-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-16)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-16
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-17-geckoview-cold:
+    description: "Raptor tp6m-17 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-17-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-17)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-17
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-18-geckoview-cold:
+    description: "Raptor tp6m-18 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-18-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-18)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-18
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-19-geckoview-cold:
+    description: "Raptor tp6m-19 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-19-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-19)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-19
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-20-geckoview-cold:
+    description: "Raptor tp6m-20 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-20-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-20)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-20
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-21-geckoview-cold:
+    description: "Raptor tp6m-21 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-21-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-21)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-21
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-22-geckoview-cold:
+    description: "Raptor tp6m-22 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-22-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-22)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-22
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-23-geckoview-cold:
+    description: "Raptor tp6m-23 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-23-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-23)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-23
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-24-geckoview-cold:
+    description: "Raptor tp6m-24 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-24-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-24)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-24
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-25-geckoview-cold:
+    description: "Raptor tp6m-25 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-25-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-25)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-25
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-tp6m-26-geckoview-cold:
+    description: "Raptor tp6m-26 cold page-load on Geckoview Example"
+    max-run-time: 2700
+    try-name: raptor-tp6m-26-geckoview-cold
+    treeherder-symbol: Rap(tp6m-c-26)
+    run-on-projects:
+        by-test-platform:
+            android-hw-p2-8-0-arm7.*/pgo: ['try', 'mozilla-central']
+            android-hw-.*-api-16/opt: ['try', 'trunk']
+            android-hw-.*-aarch64/opt: ['try', 'trunk']
+            default: ['try', 'trunk', 'mozilla-beta']
+    e10s: true
+    target: geckoview_example.apk
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-26
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
 raptor-tp6m-1-fennec-cold:
    description: "Raptor tp6m-1 cold page-load on Fennec"
    max-run-time: 2700
@ -2446,21 +2983,173 @@ raptor-tp6m-14-fennec-cold:
            - --app=fennec
            - --binary=org.mozilla.fennec_aurora

-raptor-tp6m-14-geckoview-cold:
-    description: "Raptor tp6m-14 cold page-load on Geckoview Example"
+raptor-tp6m-15-fennec-cold:
+    description: "Raptor tp6m-15 cold page-load on Fennec"
    max-run-time: 2700
-    try-name: raptor-tp6m-14-geckoview-cold
-    treeherder-symbol: Rap(tp6m-c-14)
-    run-on-projects: ['mozilla-central', 'try']
-    e10s: true
-    target: geckoview_example.apk
+    try-name: raptor-tp6m-15-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-15)
+    target: target.apk
+    run-on-projects: ['try']
    tier: 2
    mozharness:
        extra-options:
-            - --test=raptor-tp6m-cold-14
-            - --app=geckoview
-            - --binary=org.mozilla.geckoview_example
-            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+            - --test=raptor-tp6m-cold-15
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-16-fennec-cold:
+    description: "Raptor tp6m-16 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-16-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-16)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-16
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-17-fennec-cold:
+    description: "Raptor tp6m-17 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-17-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-17)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-17
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-18-fennec-cold:
+    description: "Raptor tp6m-18 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-18-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-18)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-18
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-19-fennec-cold:
+    description: "Raptor tp6m-19 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-19-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-19)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-19
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-20-fennec-cold:
+    description: "Raptor tp6m-20 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-20-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-20)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-20
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-21-fennec-cold:
+    description: "Raptor tp6m-21 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-21-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-21)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-21
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-22-fennec-cold:
+    description: "Raptor tp6m-22 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-22-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-22)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-22
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-23-fennec-cold:
+    description: "Raptor tp6m-23 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-23-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-23)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-23
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-24-fennec-cold:
+    description: "Raptor tp6m-24 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-24-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-24)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-24
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-25-fennec-cold:
+    description: "Raptor tp6m-25 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-25-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-25)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-25
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora
+
+raptor-tp6m-26-fennec-cold:
+    description: "Raptor tp6m-26 cold page-load on Fennec"
+    max-run-time: 2700
+    try-name: raptor-tp6m-26-fennec-cold
+    treeherder-symbol: Rap(tp6m-c-26)
+    target: target.apk
+    run-on-projects: ['try']
+    tier: 2
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-26
+            - --app=fennec
+            - --binary=org.mozilla.fennec_aurora

 raptor-tp6m-1-fennec64:
    description: "Raptor tp6m-1 on Fennec64"
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -496,6 +496,18 @@ android-hw-arm7-raptor:
    - raptor-tp6m-12-fenix-cold
    - raptor-tp6m-13-fenix-cold
    - raptor-tp6m-14-fenix-cold
+    - raptor-tp6m-15-fenix-cold
+    - raptor-tp6m-16-fenix-cold
+    - raptor-tp6m-17-fenix-cold
+    - raptor-tp6m-18-fenix-cold
+    - raptor-tp6m-19-fenix-cold
+    - raptor-tp6m-20-fenix-cold
+    - raptor-tp6m-21-fenix-cold
+    - raptor-tp6m-22-fenix-cold
+    - raptor-tp6m-23-fenix-cold
+    - raptor-tp6m-24-fenix-cold
+    - raptor-tp6m-25-fenix-cold
+    - raptor-tp6m-26-fenix-cold
    - raptor-tp6m-1-geckoview-cold
    - raptor-tp6m-2-geckoview-cold
    - raptor-tp6m-3-geckoview-cold
@ -510,6 +522,18 @@ android-hw-arm7-raptor:
    - raptor-tp6m-12-geckoview-cold
    - raptor-tp6m-13-geckoview-cold
    - raptor-tp6m-14-geckoview-cold
+    - raptor-tp6m-15-geckoview-cold
+    - raptor-tp6m-16-geckoview-cold
+    - raptor-tp6m-17-geckoview-cold
+    - raptor-tp6m-18-geckoview-cold
+    - raptor-tp6m-19-geckoview-cold
+    - raptor-tp6m-20-geckoview-cold
+    - raptor-tp6m-21-geckoview-cold
+    - raptor-tp6m-22-geckoview-cold
+    - raptor-tp6m-23-geckoview-cold
+    - raptor-tp6m-24-geckoview-cold
+    - raptor-tp6m-25-geckoview-cold
+    - raptor-tp6m-26-geckoview-cold
    - raptor-tp6m-1-fennec64
    - raptor-tp6m-2-fennec64
    - raptor-tp6m-3-fennec64
@ -534,6 +558,18 @@ android-hw-arm7-raptor:
    - raptor-tp6m-12-fennec-cold
    - raptor-tp6m-13-fennec-cold
    - raptor-tp6m-14-fennec-cold
+    - raptor-tp6m-15-fennec-cold
+    - raptor-tp6m-16-fennec-cold
+    - raptor-tp6m-17-fennec-cold
+    - raptor-tp6m-18-fennec-cold
+    - raptor-tp6m-19-fennec-cold
+    - raptor-tp6m-20-fennec-cold
+    - raptor-tp6m-21-fennec-cold
+    - raptor-tp6m-22-fennec-cold
+    - raptor-tp6m-23-fennec-cold
+    - raptor-tp6m-24-fennec-cold
+    - raptor-tp6m-25-fennec-cold
+    - raptor-tp6m-26-fennec-cold
    - raptor-tp6m-1-fennec64-cold
    - raptor-tp6m-2-fennec64-cold
    - raptor-tp6m-3-fennec64-cold
--- a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
+++ b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@ -141,6 +141,7 @@ class SingleTestMixin(FetchesMixin):
                #   <full-suite> is a unique id for the suite, matching desktop mozharness configs
                ('mochitest-browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
                ('mochitest-browser-chrome', 'devtools-webreplay'): 'mochitest-devtools-chrome-webreplay', # noqa
+                ('mochitest-browser-chrome', 'remote'): 'mochitest-remote',
                ('mochitest-browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots',  # noqa
                ('mochitest-plain', 'media'): 'mochitest-media',
                # below should be on test-verify-gpu job
--- a/testing/raptor/raptor/playback/mitm4-linux-firefox-tumblr.manifest
+++ b/testing/raptor/raptor/playback/mitm4-linux-firefox-tumblr.manifest
@ -0,0 +1,10 @@
+[
+  {
+    "size": 20028158,
+    "visibility": "public",
+    "digest": "2829c998c429ee03113473bb21f09f6d7b2fdaa199a009fac20cc8ebd073b2379ff7b15b286fac26ce7536967be31bb54451a582f9163bb29869cb8e43f8c9c3",
+    "algorithm": "sha512",
+    "filename": "mitm4-linux-firefox-tumblr.zip",
+    "unpack": true
+  }
+]
--- a/testing/raptor/raptor/raptor.ini
+++ b/testing/raptor/raptor/raptor.ini
@ -56,6 +56,18 @@
 [include:tests/tp6/mobile/raptor-tp6m-cold-12.ini]
 [include:tests/tp6/mobile/raptor-tp6m-cold-13.ini]
 [include:tests/tp6/mobile/raptor-tp6m-cold-14.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-15.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-16.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-17.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-18.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-19.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-20.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-21.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-22.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-23.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-24.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-25.ini]
+[include:tests/tp6/mobile/raptor-tp6m-cold-26.ini]
 [include:tests/tp6/mobile/raptor-tp6m-cold-1-fennec64.ini]
 [include:tests/tp6/mobile/raptor-tp6m-cold-2-fennec64.ini]
 [include:tests/tp6/mobile/raptor-tp6m-cold-3-fennec64.ini]
--- a/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini
+++ b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini
@ -26,8 +26,10 @@ measure = fnbpaint, fcp, dcf, loadtime

 [raptor-tp6-tumblr-firefox]
 apps = firefox
+playback_version = 4.0.4
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
 test_url = https://www.tumblr.com/dashboard
-playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
 playback_recordings = tumblr.mp
 measure = fnbpaint, fcp, dcf, loadtime

@ -41,8 +43,10 @@ disabled = Bug 1542757 - Investigate and fix TEST-UNEXPECTED-FAIL: test 'raptor-

 [raptor-tp6-tumblr-chrome]
 apps = chrome
+playback_version = 4.0.4
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
 test_url = https://www.tumblr.com/dashboard
-playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
 playback_recordings = tumblr.mp
 measure = fcp, loadtime

@ -56,7 +60,9 @@ disabled = Bug 1542757 - Investigate and fix TEST-UNEXPECTED-FAIL: test 'raptor-

 [raptor-tp6-tumblr-chromium]
 apps = chromium
+playback_version = 4.0.4
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+playback_pageset_manifest = mitm4-linux-firefox-tumblr.manifest
 test_url = https://www.tumblr.com/dashboard
-playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
 playback_recordings = tumblr.mp
 measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-amazon.manifest
 playback_recordings = android-amazon.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-facebook-geckoview-cold]
-apps = geckoview
-test_url = https://m.facebook.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
-playback_recordings = android-facebook.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-amazon-fenix-cold]
 apps = fenix
 test_url = https://www.amazon.com
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-amazon.manifest
 playback_recordings = android-amazon.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-facebook-fenix-cold]
-apps = fenix
-test_url = https://m.facebook.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
-playback_recordings = android-facebook.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-amazon-fennec-cold]
 apps = fennec
 test_url = https://www.amazon.com
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-amazon.manifest
 playback_recordings = android-amazon.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-facebook-fennec-cold]
-apps = fennec
-test_url = https://m.facebook.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
-playback_recordings = android-facebook.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bbc.manifest
 playback_recordings = mitmproxy-recordings-raptor-tp6m-bbc.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-stackoverflow-fenix-cold]
-apps = fenix
-test_url = https://stackoverflow.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-bbc-geckoview-cold]
 apps = geckoview
 test_url = https://www.bbc.com/news/business-47245877
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bbc.manifest
 playback_recordings = mitmproxy-recordings-raptor-tp6m-bbc.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-stackoverflow-geckoview-cold]
-apps = geckoview
-test_url = https://stackoverflow.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-bbc-fennec-cold]
 apps = fennec
 test_url = https://www.bbc.com/news/business-47245877
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bbc.manifest
 playback_recordings = mitmproxy-recordings-raptor-tp6m-bbc.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-stackoverflow-fennec-cold]
-apps = fennec
-test_url = https://stackoverflow.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-microsoft-support.m
 playback_recordings = android-microsoft-support.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-jianshu-fenix-cold]
-apps = fenix
-test_url = https://www.jianshu.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
-playback_recordings = android-jianshu.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-microsoft-support-geckoview-cold]
 apps = geckoview
 test_url = https://support.microsoft.com/en-us
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-microsoft-support.m
 playback_recordings = android-microsoft-support.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-jianshu-geckoview-cold]
-apps = geckoview
-test_url = https://www.jianshu.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
-playback_recordings = android-jianshu.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-microsoft-support-fennec-cold]
 apps = fennec
 test_url = https://support.microsoft.com/en-us
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-microsoft-support.m
 playback_recordings = android-microsoft-support.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-jianshu-fennec-cold]
-apps = fennec
-test_url = https://www.jianshu.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
-playback_recordings = android-jianshu.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-imdb.manifest
 playback_recordings = android-imdb.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-allrecipes-fenix-cold]
-apps = fenix
-test_url = https://www.allrecipes.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
-playback_recordings = android-allrecipes.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-imdb-geckoview-cold]
 apps = geckoview
 test_url = https://m.imdb.com/
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-imdb.manifest
 playback_recordings = android-imdb.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-allrecipes-geckoview-cold]
-apps = geckoview
-test_url = https://www.allrecipes.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
-playback_recordings = android-allrecipes.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-imdb-fennec-cold]
 apps = fennec
 test_url = https://m.imdb.com/
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-imdb.manifest
 playback_recordings = android-imdb.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-allrecipes-fennec-cold]
-apps = fennec
-test_url = https://www.allrecipes.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
-playback_recordings = android-allrecipes.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-espn.manifest
 playback_recordings = android-espn.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-web-de-fenix-cold]
-apps = fenix
-test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
-playback_recordings = android-web-de.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-espn-geckoview-cold]
 apps = geckoview
 test_url = http://www.espn.com/nba/story/_/page/allstarweekend25788027/the-comparison-lebron-james-michael-jordan-their-own-words
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-espn.manifest
 playback_recordings = android-espn.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-web-de-geckoview-cold]
-apps = geckoview
-test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
-playback_recordings = android-web-de.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-espn-fennec-cold]
 apps = fennec
 test_url = http://www.espn.com/nba/story/_/page/allstarweekend25788027/the-comparison-lebron-james-michael-jordan-their-own-words
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-espn.manifest
 playback_recordings = android-espn.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-web-de-fennec-cold]
-apps = fennec
-test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
-playback_recordings = android-web-de.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook-cristiano.
 playback_recordings = android-facebook-cristiano.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-aframeio-animation-fenix-cold]
-apps = fenix
-test_url = https://aframe.io/examples/showcase/animation
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
-playback_recordings = android-aframeio-animation.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-facebook-cristiano-geckoview-cold]
 apps = geckoview
 test_url = https://m.facebook.com/Cristiano
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook-cristiano.
 playback_recordings = android-facebook-cristiano.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-aframeio-animation-geckoview-cold]
-apps = geckoview
-test_url = https://aframe.io/examples/showcase/animation
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
-playback_recordings = android-aframeio-animation.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-facebook-cristiano-fennec-cold]
 apps = fennec
 test_url = https://m.facebook.com/Cristiano
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook-cristiano.
 playback_recordings = android-facebook-cristiano.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-aframeio-animation-fennec-cold]
-apps = fennec
-test_url = https://aframe.io/examples/showcase/animation
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
-playback_recordings = android-aframeio-animation.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-15.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-15.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-15
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-facebook-geckoview-cold]
+apps = geckoview
+test_url = https://m.facebook.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
+playback_recordings = android-facebook.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-facebook-fenix-cold]
+apps = fenix
+test_url = https://m.facebook.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
+playback_recordings = android-facebook.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-facebook-fennec-cold]
+apps = fennec
+test_url = https://m.facebook.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-facebook.manifest
+playback_recordings = android-facebook.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-16.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-16.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-16
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-youtube-fenix-cold]
+apps = fenix
+test_url = https://m.youtube.com
+playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
+playback_recordings = android-youtube.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-youtube-geckoview-cold]
+apps = geckoview
+test_url = https://m.youtube.com
+playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
+playback_recordings = android-youtube.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-youtube-fennec-cold]
+apps = fennec
+test_url = https://m.youtube.com
+playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
+playback_recordings = android-youtube.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-17.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-17.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-17
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-bing-fenix-cold]
+apps = fenix
+test_url = https://www.bing.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
+playback_recordings = bing-mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-bing-geckoview-cold]
+apps = geckoview
+test_url = https://www.bing.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
+playback_recordings = bing-mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-bing-fennec-cold]
+apps = fennec
+test_url = https://www.bing.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
+playback_recordings = bing-mobile.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-18.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-18.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-18
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-ebay-kleinanzeigen-fenix-cold]
+apps = fenix
+test_url = https://m.ebay-kleinanzeigen.de
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
+playback_recordings = ebay-kleinanzeigen-mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-ebay-kleinanzeigen-geckoview-cold]
+apps = geckoview
+test_url = https://m.ebay-kleinanzeigen.de
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
+playback_recordings = ebay-kleinanzeigen-mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-ebay-kleinanzeigen-fennec-cold]
+apps = fennec
+test_url = https://m.ebay-kleinanzeigen.de
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
+playback_recordings = ebay-kleinanzeigen-mobile.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-19.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-19.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-19
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-google-maps-fenix-cold]
+apps = fenix
+test_url = https://www.google.com/maps?force=pwa
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
+playback_recordings = google_maps_mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-google-maps-geckoview-cold]
+apps = geckoview
+test_url = https://www.google.com/maps?force=pwa
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
+playback_recordings = google_maps_mobile.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-google-maps-fennec-cold]
+apps = fennec
+test_url = https://www.google.com/maps?force=pwa
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
+playback_recordings = google_maps_mobile.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google.manifest
 playback_recordings = android-google.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-youtube-fenix-cold]
-apps = fenix
-test_url = https://m.youtube.com
-playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
-playback_recordings = android-youtube.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-google-geckoview-cold]
 apps = geckoview
 test_url = https://www.google.com
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google.manifest
 playback_recordings = android-google.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-youtube-geckoview-cold]
-apps = geckoview
-test_url = https://m.youtube.com
-playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
-playback_recordings = android-youtube.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-google-fennec-cold]
 apps = fennec
 test_url = https://www.google.com
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google.manifest
 playback_recordings = android-google.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-youtube-fennec-cold]
-apps = fennec
-test_url = https://m.youtube.com
-playback_pageset_manifest = mitm4-motog5-gve-youtube.manifest
-playback_recordings = android-youtube.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-20.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-20.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-20
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-youtube-watch-fenix-cold]
+apps = fenix
+test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
+playback_recordings = android-youtube-watch.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-youtube-watch-geckoview-cold]
+apps = geckoview
+test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
+playback_recordings = android-youtube-watch.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-youtube-watch-fennec-cold]
+apps = fennec
+test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
+playback_recordings = android-youtube-watch.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-21.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-21.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-21
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-reddit-fenix-cold]
+apps = fenix
+test_url = https://www.reddit.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-reddit-geckoview-cold]
+apps = geckoview
+test_url = https://www.reddit.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-reddit-fennec-cold]
+apps = fennec
+test_url = https://www.reddit.com
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-22.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-22.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-22
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-stackoverflow-fenix-cold]
+apps = fenix
+test_url = https://stackoverflow.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-stackoverflow-geckoview-cold]
+apps = geckoview
+test_url = https://stackoverflow.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-stackoverflow-fennec-cold]
+apps = fennec
+test_url = https://stackoverflow.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-stackoverflow.manifest
+playback_recordings = mitmproxy-recordings-raptor-tp6m-stackoverflow.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-23.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-23.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-23
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-jianshu-fenix-cold]
+apps = fenix
+test_url = https://www.jianshu.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
+playback_recordings = android-jianshu.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-jianshu-geckoview-cold]
+apps = geckoview
+test_url = https://www.jianshu.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
+playback_recordings = android-jianshu.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-jianshu-fennec-cold]
+apps = fennec
+test_url = https://www.jianshu.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-jianshu.manifest
+playback_recordings = android-jianshu.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-24.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-24.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-24
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-allrecipes-fenix-cold]
+apps = fenix
+test_url = https://www.allrecipes.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
+playback_recordings = android-allrecipes.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-allrecipes-geckoview-cold]
+apps = geckoview
+test_url = https://www.allrecipes.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
+playback_recordings = android-allrecipes.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-allrecipes-fennec-cold]
+apps = fennec
+test_url = https://www.allrecipes.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-allrecipes.manifest
+playback_recordings = android-allrecipes.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-25.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-25.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-25
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-web-de-fenix-cold]
+apps = fenix
+test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
+playback_recordings = android-web-de.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-web-de-geckoview-cold]
+apps = geckoview
+test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
+playback_recordings = android-web-de.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-web-de-fennec-cold]
+apps = fennec
+test_url = https://web.de/magazine/politik/politologe-glaubt-grossen-koalition-herbst-knallen-33563566
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-web-de.manifest
+playback_recordings = android-web-de.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-26.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-26.ini
@ -0,0 +1,39 @@
+# 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/.
+
+# raptor tp6m-cold-26
+
+[DEFAULT]
+type = pageload
+playback = mitmproxy-android
+playback_binary_manifest = mitmproxy-rel-bin-{platform}.manifest
+browser_cycles = 15
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+page_timeout = 60000
+alert_on = fcp, loadtime
+cold = true
+
+[raptor-tp6m-aframeio-animation-fenix-cold]
+apps = fenix
+test_url = https://aframe.io/examples/showcase/animation
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
+playback_recordings = android-aframeio-animation.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-aframeio-animation-geckoview-cold]
+apps = geckoview
+test_url = https://aframe.io/examples/showcase/animation
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
+playback_recordings = android-aframeio-animation.mp
+measure = fnbpaint, fcp, dcf, loadtime
+
+[raptor-tp6m-aframeio-animation-fennec-cold]
+apps = fennec
+test_url = https://aframe.io/examples/showcase/animation
+playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-aframeio-animation.manifest
+playback_recordings = android-aframeio-animation.mp
+measure = fnbpaint, dcf, loadtime
+alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-instagram-mobile.ma
 playback_recordings = instagram-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-bing-fenix-cold]
-apps = fenix
-test_url = https://www.bing.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
-playback_recordings = bing-mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-instagram-geckoview-cold]
 apps = geckoview
 test_url = https://www.instagram.com
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-instagram-mobile.ma
 playback_recordings = instagram-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-bing-geckoview-cold]
-apps = geckoview
-test_url = https://www.bing.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
-playback_recordings = bing-mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-instagram-fennec-cold]
 apps = fennec
 test_url = https://www.instagram.com
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-instagram-mobile.ma
 playback_recordings = instagram-mobile.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-bing-fennec-cold]
-apps = fennec
-test_url = https://www.bing.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-mobile.manifest
-playback_recordings = bing-mobile.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-restaurants-mo
 playback_recordings = bing-restaurants-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-ebay-kleinanzeigen-fenix-cold]
-apps = fenix
-test_url = https://m.ebay-kleinanzeigen.de
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
-playback_recordings = ebay-kleinanzeigen-mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-bing-restaurants-geckoview-cold]
 apps = geckoview
 test_url = https://www.bing.com/search?q=restaurants
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-restaurants-mo
 playback_recordings = bing-restaurants-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-ebay-kleinanzeigen-geckoview-cold]
-apps = geckoview
-test_url = https://m.ebay-kleinanzeigen.de
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
-playback_recordings = ebay-kleinanzeigen-mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-bing-restaurants-fennec-cold]
 apps = fennec
 test_url = https://www.bing.com/search?q=restaurants
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-bing-restaurants-mo
 playback_recordings = bing-restaurants-mobile.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-ebay-kleinanzeigen-fennec-cold]
-apps = fennec
-test_url = https://m.ebay-kleinanzeigen.de
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-mobile.manifest
-playback_recordings = ebay-kleinanzeigen-mobile.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-
 playback_recordings = ebay-kleinanzeigen-search-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-google-maps-fenix-cold]
-apps = fenix
-test_url = https://www.google.com/maps?force=pwa
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
-playback_recordings = google_maps_mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-ebay-kleinanzeigen-search-geckoview-cold]
 apps = geckoview
 test_url = https://m.ebay-kleinanzeigen.de/s-anzeigen/auf-zeit-wg-berlin/zimmer/c199-l3331
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-
 playback_recordings = ebay-kleinanzeigen-search-mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-google-maps-geckoview-cold]
-apps = geckoview
-test_url = https://www.google.com/maps?force=pwa
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
-playback_recordings = google_maps_mobile.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-ebay-kleinanzeigen-search-fennec-cold]
 apps = fennec
 test_url = https://m.ebay-kleinanzeigen.de/s-anzeigen/auf-zeit-wg-berlin/zimmer/c199-l3331
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-ebay-kleinanzeigen-
 playback_recordings = ebay-kleinanzeigen-search-mobile.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-google-maps-fennec-cold]
-apps = fennec
-test_url = https://www.google.com/maps?force=pwa
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
-playback_recordings = google_maps_mobile.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-wikipedia.manifest
 playback_recordings = android-wikipedia.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-youtube-watch-fenix-cold]
-apps = fenix
-test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
-playback_recordings = android-youtube-watch.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-wikipedia-geckoview-cold]
 apps = geckoview
 test_url = https://en.m.wikipedia.org/wiki/Main_Page
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-wikipedia.manifest
 playback_recordings = android-wikipedia.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-youtube-watch-geckoview-cold]
-apps = geckoview
-test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
-playback_recordings = android-youtube-watch.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-wikipedia-fennec-cold]
 apps = fennec
 test_url = https://en.m.wikipedia.org/wiki/Main_Page
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-wikipedia.manifest
 playback_recordings = android-wikipedia.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-youtube-watch-fennec-cold]
-apps = fennec
-test_url = https://www.youtube.com/watch?v=COU5T-Wafa4
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-youtube-watch.manifest
-playback_recordings = android-youtube-watch.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime
--- a/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9.ini
+++ b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9.ini
@ -23,13 +23,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-cnn-ampstories.mani
 playback_recordings = android-cnn-ampstories.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-reddit-fenix-cold]
-apps = fenix
-test_url = https://www.reddit.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-cnn-ampstories-geckoview-cold]
 apps = geckoview
 test_url = https://edition.cnn.com/ampstories/us/why-hurricane-michael-is-a-monster-unlike-any-other
@ -37,13 +30,6 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-cnn-ampstories.mani
 playback_recordings = android-cnn-ampstories.mp
 measure = fnbpaint, fcp, dcf, loadtime

-[raptor-tp6m-reddit-geckoview-cold]
-apps = geckoview
-test_url = https://www.reddit.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
 [raptor-tp6m-cnn-ampstories-fennec-cold]
 apps = fennec
 test_url = https://edition.cnn.com/ampstories/us/why-hurricane-michael-is-a-monster-unlike-any-other
@ -51,11 +37,3 @@ playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-cnn-ampstories.mani
 playback_recordings = android-cnn-ampstories.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-
-[raptor-tp6m-reddit-fennec-cold]
-apps = fennec
-test_url = https://www.reddit.com
-playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-reddit.manifest
-playback_recordings = mitmproxy-recordings-raptor-tp6m-reddit.mp
-measure = fnbpaint, dcf, loadtime
-alert_on = loadtime