Bug 1539437 - Replace Chrome with Chromium mentionings where needed r=sparky,davehunt
authorIonut Goldan <igoldan@mozilla.com>
Fri, 12 Apr 2019 10:33:24 +0000
changeset 528094 6800e99ad32ab85ccce4de926e261b93ce2b45fb
parent 528093 f95dc32944ac670befcd7a2d1355877db4ed3831
child 528095 5505ed4893d60ec06cef45c4b868fec5099107e6
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssparky, davehunt
bugs1539437
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1539437 - Replace Chrome with Chromium mentionings where needed r=sparky,davehunt Differential Revision: https://phabricator.services.mozilla.com/D25094
taskcluster/ci/config.yml
taskcluster/ci/fetch/chromium-fetch.yml
taskcluster/ci/test/kind.yml
taskcluster/ci/test/raptor-chrome.yml
taskcluster/ci/test/raptor-chromium.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/scripts/misc/fetch-chromium.py
taskcluster/taskgraph/transforms/fetch.py
testing/mozbase/mozprofile/mozprofile/profile.py
testing/mozbase/mozprofile/tests/test_profile.py
testing/mozbase/mozrunner/mozrunner/application.py
testing/mozbase/mozrunner/mozrunner/runners.py
testing/mozbase/mozrunner/tests/conftest.py
testing/mozharness/configs/raptor/android_hw_config.py
testing/mozharness/configs/raptor/linux_config.py
testing/mozharness/configs/raptor/mac_config.py
testing/mozharness/configs/raptor/windows_config.py
testing/mozharness/configs/raptor/windows_vm_config.py
testing/mozharness/mozharness/mozilla/testing/raptor.py
testing/raptor/mach_commands.py
testing/raptor/raptor/cmdline.py
testing/raptor/raptor/raptor.py
testing/raptor/raptor/tests/raptor-assorted-dom.ini
testing/raptor/raptor/tests/raptor-motionmark-animometer.ini
testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini
testing/raptor/raptor/tests/raptor-speedometer.ini
testing/raptor/raptor/tests/raptor-stylebench.ini
testing/raptor/raptor/tests/raptor-sunspider.ini
testing/raptor/raptor/tests/raptor-tp6-1.ini
testing/raptor/raptor/tests/raptor-tp6-10.ini
testing/raptor/raptor/tests/raptor-tp6-2.ini
testing/raptor/raptor/tests/raptor-tp6-3.ini
testing/raptor/raptor/tests/raptor-tp6-4.ini
testing/raptor/raptor/tests/raptor-tp6-5.ini
testing/raptor/raptor/tests/raptor-tp6-6.ini
testing/raptor/raptor/tests/raptor-tp6-7.ini
testing/raptor/raptor/tests/raptor-tp6-8-404.ini
testing/raptor/raptor/tests/raptor-tp6-8.ini
testing/raptor/raptor/tests/raptor-tp6-9.ini
testing/raptor/raptor/tests/raptor-unity-webgl.ini
testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini
testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
testing/raptor/raptor/tests/raptor-wasm-godot.ini
testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini
testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
testing/raptor/raptor/tests/raptor-wasm-misc.ini
testing/raptor/raptor/tests/raptor-webaudio.ini
testing/raptor/test/test_manifest.py
testing/raptor/test/test_raptor.py
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -29,18 +29,22 @@ treeherder:
         'R-sw': 'Reftests with serviceworker redesign enabled'
         'R-e10s': 'Reftests with e10s'
         'R-sw-e10s': 'Reftests with serviceworker redesign and e10s'
         'Rap': 'Raptor performance tests on Firefox'
         'Rap-e10s': 'Raptor performance tests on Firefox with e10s'
         'Rap-refbrow-e10s': 'Raptor performance tests on the reference browser'
         'Rap-Prof': 'Raptor performance tests on Firefox with Gecko Profiling'
         'Rap-Prof-e10s': 'Raptor performance tests on Firefox with Gecko Profiling'
-        'Rap-C': 'Raptor performance tests on Google Chrome'
-        'Rap-C-e10s': 'Raptor performance tests on Google Chrome with e10s'
+        'Rap-ChC': 'Raptor performance tests on Google Chrome Canary'
+        'Rap-ChC-e10s': 'Raptor performance tests on Google Chrome Canary with e10s'
+        'Rap-ChD': 'Raptor performance tests on Google Chrome Dev'
+        'Rap-ChD-e10s': 'Raptor performance tests on Google Chrome Dev with e10s'
+        'Rap-Cr': 'Raptor performance tests on Google Chromium'
+        'Rap-Cr-e10s': 'Raptor performance tests on Google Chromium with e10s'
         'Rap-P': 'Raptor power tests on Firefox'
         'Rap-P-e10s': 'Raptor power tests on Firefox with e10s'
         'T': 'Talos performance tests'
         'Tsd': 'Talos performance tests with Stylo disabled'
         'Tss': 'Talos performance tests with Stylo sequential'
         'T-e10s': 'Talos performance tests with e10s'
         'Tsd-e10s': 'Talos performance tests with e10s, Stylo disabled'
         'Tss-e10s': 'Talos performance tests with e10s, Stylo sequential'
--- a/taskcluster/ci/fetch/chromium-fetch.yml
+++ b/taskcluster/ci/fetch/chromium-fetch.yml
@@ -2,27 +2,27 @@ job-defaults:
     fetch:
         type: chromium-fetch
         script: /builds/worker/bin/fetch-chromium.py
 
 linux64-chromium:
     description: 'Linux64 Chromium Fetch'
     fetch:
         platform: linux
-        artifact-name: chrome-linux.tar.bz2
+        artifact-name: chromium-linux.tar.bz2
 
 win32-chromium:
     description: 'Windows32 Chromium Fetch'
     fetch:
         platform: win32
-        artifact-name: chrome-win32.tar.bz2
+        artifact-name: chromium-win32.tar.bz2
 
 win64-chromium:
     description: 'Windows64 Chromium Fetch'
     fetch:
         platform: win64
-        artifact-name: chrome-win64.tar.bz2
+        artifact-name: chromium-win64.tar.bz2
 
 mac-chromium:
     description: 'MacOSX Chromium Fetch'
     fetch:
         platform: mac
-        artifact-name: chrome-mac.tar.bz2
+        artifact-name: chromium-mac.tar.bz2
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -24,17 +24,17 @@ transforms:
 jobs-from:
     - awsy.yml
     - compiled.yml
     - firefox-ui.yml
     - marionette.yml
     - misc.yml
     - mochitest.yml
     - raptor.yml
-    - raptor-chrome.yml
+    - raptor-chromium.yml
     - reftest.yml
     - talos.yml
     - web-platform.yml
     - xpcshell.yml
 
 
 job-defaults:
     require-signed-extensions:
rename from taskcluster/ci/test/raptor-chrome.yml
rename to taskcluster/ci/test/raptor-chromium.yml
--- a/taskcluster/ci/test/raptor-chrome.yml
+++ b/taskcluster/ci/test/raptor-chromium.yml
@@ -38,247 +38,247 @@ job-defaults:
                     - win64-chromium
                 win.*32.*:
                     - win32-chromium
                 macosx.*:
                     - mac-chromium
                 default:
                     - linux64-chromium
 
-raptor-tp6-1-chrome:
-    description: "Raptor tp6-1 on Chrome"
-    try-name: raptor-tp6-1-chrome
-    treeherder-symbol: Rap-C(tp6-1)
+raptor-tp6-1-chromium:
+    description: "Raptor tp6-1 on Chromium"
+    try-name: raptor-tp6-1-chromium
+    treeherder-symbol: Rap-Cr(tp6-1)
     max-run-time: 1200
     mozharness:
         extra-options:
             - --test=raptor-tp6-1
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-2-chrome:
-    description: "Raptor tp6-2 on Chrome"
-    try-name: raptor-tp6-2-chrome
-    treeherder-symbol: Rap-C(tp6-2)
+raptor-tp6-2-chromium:
+    description: "Raptor tp6-2 on Chromium"
+    try-name: raptor-tp6-2-chromium
+    treeherder-symbol: Rap-Cr(tp6-2)
     mozharness:
         extra-options:
             - --test=raptor-tp6-2
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-3-chrome:
-    description: "Raptor tp6-3 on Chrome"
-    try-name: raptor-tp6-3-chrome
-    treeherder-symbol: Rap-C(tp6-3)
+raptor-tp6-3-chromium:
+    description: "Raptor tp6-3 on Chromium"
+    try-name: raptor-tp6-3-chromium
+    treeherder-symbol: Rap-Cr(tp6-3)
     max-run-time: 2400
     mozharness:
         extra-options:
             - --test=raptor-tp6-3
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-4-chrome:
-    description: "Raptor tp6-4 on Chrome"
-    try-name: raptor-tp6-4-chrome
-    treeherder-symbol: Rap-C(tp6-4)
+raptor-tp6-4-chromium:
+    description: "Raptor tp6-4 on Chromium"
+    try-name: raptor-tp6-4-chromium
+    treeherder-symbol: Rap-Cr(tp6-4)
     mozharness:
         extra-options:
             - --test=raptor-tp6-4
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-5-chrome:
-    description: "Raptor tp6-5 on Chrome"
-    try-name: raptor-tp6-5-chrome
-    treeherder-symbol: Rap-C(tp6-5)
+raptor-tp6-5-chromium:
+    description: "Raptor tp6-5 on Chromium"
+    try-name: raptor-tp6-5-chromium
+    treeherder-symbol: Rap-Cr(tp6-5)
     mozharness:
         extra-options:
             - --test=raptor-tp6-5
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-6-chrome:
-    description: "Raptor tp6-6 on Chrome"
-    try-name: raptor-tp6-6-chrome
-    treeherder-symbol: Rap-C(tp6-6)
+raptor-tp6-6-chromium:
+    description: "Raptor tp6-6 on Chromium"
+    try-name: raptor-tp6-6-chromium
+    treeherder-symbol: Rap-Cr(tp6-6)
     mozharness:
         extra-options:
             - --test=raptor-tp6-6
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-7-chrome:
-    description: "Raptor tp6-7 on Chrome"
-    try-name: raptor-tp6-7-chrome
-    treeherder-symbol: Rap-C(tp6-7)
+raptor-tp6-7-chromium:
+    description: "Raptor tp6-7 on Chromium"
+    try-name: raptor-tp6-7-chromium
+    treeherder-symbol: Rap-Cr(tp6-7)
     mozharness:
         extra-options:
             - --test=raptor-tp6-7
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-8-chrome:
-    description: "Raptor tp6-8 on Chrome"
-    try-name: raptor-tp6-8-chrome
-    treeherder-symbol: Rap-C(tp6-8)
+raptor-tp6-8-chromium:
+    description: "Raptor tp6-8 on Chromium"
+    try-name: raptor-tp6-8-chromium
+    treeherder-symbol: Rap-Cr(tp6-8)
     mozharness:
         extra-options:
             - --test=raptor-tp6-8
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-8-404-chrome:
-    description: "Raptor tp6-8-404 on Chrome"
-    try-name: raptor-tp6-8-404-chrome
-    treeherder-symbol: Rap-C(tp6-8-404)
+raptor-tp6-8-404-chromium:
+    description: "Raptor tp6-8-404 on Chromium"
+    try-name: raptor-tp6-8-404-chromium
+    treeherder-symbol: Rap-Cr(tp6-8-404)
     tier: 3
     mozharness:
         extra-options:
             - --test=raptor-tp6-8-404
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-9-chrome:
-    description: "Raptor tp6-9 on Chrome"
-    try-name: raptor-tp6-9-chrome
-    treeherder-symbol: Rap-C(tp6-9)
+raptor-tp6-9-chromium:
+    description: "Raptor tp6-9 on Chromium"
+    try-name: raptor-tp6-9-chromium
+    treeherder-symbol: Rap-Cr(tp6-9)
     mozharness:
         extra-options:
             - --test=raptor-tp6-9
-            - --app=chrome
+            - --app=chromium
 
-raptor-tp6-10-chrome:
-    description: "Raptor tp6-10 on Chrome"
-    try-name: raptor-tp6-10-chrome
-    treeherder-symbol: Rap-C(tp6-10)
+raptor-tp6-10-chromium:
+    description: "Raptor tp6-10 on Chromium"
+    try-name: raptor-tp6-10-chromium
+    treeherder-symbol: Rap-Cr(tp6-10)
     mozharness:
         extra-options:
             - --test=raptor-tp6-10
-            - --app=chrome
+            - --app=chromium
 
-raptor-speedometer-chrome:
-    description: "Raptor Speedometer on Chrome"
-    try-name: raptor-speedometer-chrome
-    treeherder-symbol: Rap-C(sp)
+raptor-speedometer-chromium:
+    description: "Raptor Speedometer on Chromium"
+    try-name: raptor-speedometer-chromium
+    treeherder-symbol: Rap-Cr(sp)
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-speedometer
-            - --app=chrome
+            - --app=chromium
 
-raptor-stylebench-chrome:
-    description: "Raptor StyleBench on Chrome"
-    try-name: raptor-stylebench-chrome
-    treeherder-symbol: Rap-C(sb)
+raptor-stylebench-chromium:
+    description: "Raptor StyleBench on Chromium"
+    try-name: raptor-stylebench-chromium
+    treeherder-symbol: Rap-Cr(sb)
     mozharness:
         extra-options:
             - --test=raptor-stylebench
-            - --app=chrome
+            - --app=chromium
 
-raptor-motionmark-htmlsuite-chrome:
-    description: "Raptor MotionMark HtmlSuite on Chrome"
-    try-name: raptor-motionmark-htmlsuite-chrome
-    treeherder-symbol: Rap-C(mm-h)
+raptor-motionmark-htmlsuite-chromium:
+    description: "Raptor MotionMark HtmlSuite on Chromium"
+    try-name: raptor-motionmark-htmlsuite-chromium
+    treeherder-symbol: Rap-Cr(mm-h)
     mozharness:
         extra-options:
             - --test=raptor-motionmark-htmlsuite
-            - --app=chrome
+            - --app=chromium
 
-raptor-motionmark-animometer-chrome:
-    description: "Raptor MotionMark Animometer on Chrome"
-    try-name: raptor-motionmark-animometer-chrome
-    treeherder-symbol: Rap-C(mm-a)
+raptor-motionmark-animometer-chromium:
+    description: "Raptor MotionMark Animometer on Chromium"
+    try-name: raptor-motionmark-animometer-chromium
+    treeherder-symbol: Rap-Cr(mm-a)
     mozharness:
         extra-options:
             - --test=raptor-motionmark-animometer
-            - --app=chrome
+            - --app=chromium
 
-raptor-webaudio-chrome:
-    description: "Raptor WebAudio on Chrome"
-    try-name: raptor-webaudio-chrome
-    treeherder-symbol: Rap-C(wa)
+raptor-webaudio-chromium:
+    description: "Raptor WebAudio on Chromium"
+    try-name: raptor-webaudio-chromium
+    treeherder-symbol: Rap-Cr(wa)
     mozharness:
         extra-options:
             - --test=raptor-webaudio
-            - --app=chrome
+            - --app=chromium
 
-raptor-sunspider-chrome:
-    description: "Raptor SunSpider on Chrome"
-    try-name: raptor-sunspider-chrome
-    treeherder-symbol: Rap-C(ss)
+raptor-sunspider-chromium:
+    description: "Raptor SunSpider on Chromium"
+    try-name: raptor-sunspider-chromium
+    treeherder-symbol: Rap-Cr(ss)
     mozharness:
         extra-options:
             - --test=raptor-sunspider
-            - --app=chrome
+            - --app=chromium
 
-raptor-unity-webgl-chrome:
-    description: "Raptor Unity WebGL on Chrome"
-    try-name: raptor-unity-webgl-chrome
-    treeherder-symbol: Rap-C(ugl)
+raptor-unity-webgl-chromium:
+    description: "Raptor Unity WebGL on Chromium"
+    try-name: raptor-unity-webgl-chromium
+    treeherder-symbol: Rap-Cr(ugl)
     mozharness:
         extra-options:
             - --test=raptor-unity-webgl
-            - --app=chrome
+            - --app=chromium
     fetches:
         fetch:
             by-test-platform:
                 win.*64.*:
                     - win64-chromium
                     - unity-webgl
                 win.*32.*:
                     - win32-chromium
                     - unity-webgl
                 macosx.*:
                     - mac-chromium
                     - unity-webgl
                 default:
                     - linux64-chromium
                     - unity-webgl
 
-raptor-wasm-misc-chrome:
-    description: "Raptor WASM Misc on Chrome"
-    try-name: raptor-wasm-misc-chrome
-    treeherder-symbol: Rap-C(wm)
+raptor-wasm-misc-chromium:
+    description: "Raptor WASM Misc on Chromium"
+    try-name: raptor-wasm-misc-chromium
+    treeherder-symbol: Rap-Cr(wm)
     mozharness:
         extra-options:
             - --test=raptor-wasm-misc
-            - --app=chrome
+            - --app=chromium
     fetches:
         fetch:
             by-test-platform:
                 win.*64.*:
                     - win64-chromium
                     - wasm-misc
                 win.*32.*:
                     - win32-chromium
                     - wasm-misc
                 macosx.*:
                     - mac-chromium
                     - wasm-misc
                 default:
                     - linux64-chromium
                     - wasm-misc
 
-raptor-assorted-dom-chrome:
-    description: "Raptor Assorted-Dom on Chrome"
-    try-name: raptor-assorted-dom-chrome
-    treeherder-symbol: Rap-C(dom)
+raptor-assorted-dom-chromium:
+    description: "Raptor Assorted-Dom on Chromium"
+    try-name: raptor-assorted-dom-chromium
+    treeherder-symbol: Rap-Cr(dom)
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-assorted-dom
-            - --app=chrome
+            - --app=chromium
     fetches:
         fetch:
             by-test-platform:
                 win.*64.*:
                     - win64-chromium
                     - assorted-dom
                 win.*32.*:
                     - win32-chromium
                     - assorted-dom
                 macosx.*:
                     - mac-chromium
                     - assorted-dom
                 default:
                     - linux64-chromium
                     - assorted-dom
 
-raptor-wasm-godot-chrome:
-    description: "Raptor Wasm Godot on Chrome"
-    try-name: raptor-wasm-godot-chrome
-    treeherder-symbol: Rap-C(godot)
+raptor-wasm-godot-chromium:
+    description: "Raptor Wasm Godot on Chromium"
+    try-name: raptor-wasm-godot-chromium
+    treeherder-symbol: Rap-Cr(godot)
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-wasm-godot
-            - --app=chrome
+            - --app=chromium
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -57,18 +57,18 @@ linux64-shippable/opt:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
         - talos
         - awsy
         - mochitest-headless
         - linux-talos-flex
-        - raptor-chrome
-        - raptor-fetch-chrome
+        - raptor-chromium
+        - raptor-fetch-chromium
         - raptor-firefox
         - raptor-fetch-firefox
         - raptor-profiling
         - raptor-fetch-profiling
 linux64-devedition/opt:
     build-platform: linux64-devedition-nightly/opt
     test-sets:
         - common-tests
@@ -153,17 +153,17 @@ windows7-32-shippable/opt:
     build-platform: win32-shippable/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
         - windows-tests
         - web-platform-tests
-        - raptor-chrome
+        - raptor-chromium
         - raptor-firefox
 
 windows7-32-devedition/opt:
     build-platform: win32-devedition-nightly/opt
     test-sets:
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-tests
@@ -225,17 +225,17 @@ windows10-64-shippable/opt:
         - desktop-screenshot-capture
         - desktop-instrumentation
         - windows-talos
         - marionette-gpu-tests
         - windows-tests
         - web-platform-tests
         - mochitest-headless
         - raptor-firefox
-        - raptor-chrome
+        - raptor-chromium
         - raptor-profiling
 
 windows10-64-devedition/opt:
     build-platform: win64-devedition-nightly/opt
     test-sets:
         - desktop-screenshot-capture
         - marionette-gpu-tests
         - windows-tests
@@ -282,17 +282,17 @@ macosx64/debug:
 
 macosx64-shippable/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
         - macosx64-talos
         - macosx64-tests
         - desktop-screenshot-capture
         - awsy
-        - raptor-chrome
+        - raptor-chromium
         - raptor-firefox
         - raptor-profiling
         - marionette-media-tests
 macosx64-devedition/opt:
     build-platform: macosx64-devedition-nightly/opt
     test-sets:
         - macosx64-tests
 
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -114,35 +114,35 @@ raptor-profiling:
     - raptor-speedometer-firefox-profiling
     - raptor-stylebench-firefox-profiling
     - raptor-motionmark-htmlsuite-firefox-profiling
     - raptor-motionmark-animometer-firefox-profiling
     - raptor-webaudio-firefox-profiling
     - raptor-sunspider-firefox-profiling
     - raptor-wasm-godot-firefox-profiling
 
-raptor-chrome:
-    - raptor-tp6-1-chrome
-    - raptor-tp6-2-chrome
-    - raptor-tp6-3-chrome
-    - raptor-tp6-4-chrome
-    - raptor-tp6-5-chrome
-    - raptor-tp6-6-chrome
-    - raptor-tp6-7-chrome
-    - raptor-tp6-8-chrome
-    - raptor-tp6-8-404-chrome
-    - raptor-tp6-9-chrome
-    - raptor-tp6-10-chrome
-    - raptor-speedometer-chrome
-    - raptor-stylebench-chrome
-    - raptor-motionmark-htmlsuite-chrome
-    - raptor-motionmark-animometer-chrome
-    - raptor-webaudio-chrome
-    - raptor-sunspider-chrome
-    - raptor-wasm-godot-chrome
+raptor-chromium:
+    - raptor-tp6-1-chromium
+    - raptor-tp6-2-chromium
+    - raptor-tp6-3-chromium
+    - raptor-tp6-4-chromium
+    - raptor-tp6-5-chromium
+    - raptor-tp6-6-chromium
+    - raptor-tp6-7-chromium
+    - raptor-tp6-8-chromium
+    - raptor-tp6-8-404-chromium
+    - raptor-tp6-9-chromium
+    - raptor-tp6-10-chromium
+    - raptor-speedometer-chromium
+    - raptor-stylebench-chromium
+    - raptor-motionmark-htmlsuite-chromium
+    - raptor-motionmark-animometer-chromium
+    - raptor-webaudio-chromium
+    - raptor-sunspider-chromium
+    - raptor-wasm-godot-chromium
 
 # Fetch tasks are only supported on Linux for now,
 # so these need to be separate sets.
 raptor-fetch-firefox:
     - raptor-unity-webgl-firefox
     - raptor-wasm-misc-firefox
     - raptor-wasm-misc-baseline-firefox
     - raptor-wasm-misc-ion-firefox
@@ -161,20 +161,20 @@ raptor-fetch-profiling:
     - raptor-wasm-godot-ion-firefox-profiling
     - raptor-wasm-godot-cranelift-firefox-profiling
     - raptor-assorted-dom-firefox-profiling
 
 raptor-fetch-geckoview:
     - raptor-unity-webgl-geckoview
     - raptor-unity-webgl-refbrow
 
-raptor-fetch-chrome:
-    - raptor-unity-webgl-chrome
-    - raptor-wasm-misc-chrome
-    - raptor-assorted-dom-chrome
+raptor-fetch-chromium:
+    - raptor-unity-webgl-chromium
+    - raptor-wasm-misc-chromium
+    - raptor-assorted-dom-chromium
 
 awsy:
     - awsy
     - awsy-base
     - awsy-dmd
     - awsy-base-dmd
     - awsy-tp6
 
--- a/taskcluster/scripts/misc/fetch-chromium.py
+++ b/taskcluster/scripts/misc/fetch-chromium.py
@@ -28,32 +28,32 @@ NEWREV_REVISION_URL = NEWEST_BASE_URL + 
 
 OLDREV_BASE_URL = 'http://commondatastorage.googleapis.com/chromium-browser-snapshots/'
 OLDREV_DOWNLOAD_URL = OLDREV_BASE_URL + '%s/%s/%s'  # (platform/revision/archive)
 
 CHROMIUM_INFO = {
     'linux': {
         'platform': 'Linux_x64',
         'archive': 'chrome-linux.zip',
-        'result': 'chrome-linux.tar.bz2'
+        'result': 'chromium-linux.tar.bz2'
     },
     'win32': {
         'platform': 'Win_x64',
         'archive': 'chrome-win.zip',
-        'result': 'chrome-win32.tar.bz2'
+        'result': 'chromium-win32.tar.bz2'
     },
     'win64': {
         'platform': 'Win_x64',
         'archive': 'chrome-win.zip',
-        'result': 'chrome-win64.tar.bz2'
+        'result': 'chromium-win64.tar.bz2'
     },
     'mac': {
         'platform': 'Mac',
         'archive': 'chrome-mac.zip',
-        'result': 'chrome-mac.tar.bz2'
+        'result': 'chromium-mac.tar.bz2'
     }
 }
 
 
 def log(msg):
     print('build-chromium: %s' % msg)
 
 
@@ -132,17 +132,17 @@ def build_chromium_archive(platform, rev
             log('Creating upload directory in %s...' % os.path.abspath(upload_dir))
             os.makedirs(upload_dir)
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
 
     # Make a temporary location for the file
     tmppath = tempfile.mkdtemp()
-    tmpzip = os.path.join(tmppath, 'tmp-chrome.zip')
+    tmpzip = os.path.join(tmppath, 'tmp-chromium.zip')
 
     revision = fetch_chromium_build(platform, revision, tmpzip)
 
     # Unpack archive in `tmpzip` to store the revision number
     log('Unpacking archive at: %s to: %s' % (tmpzip, tmppath))
     unzip_command = ['unzip', '-q', '-o', tmpzip, '-d', tmppath]
     subprocess.check_call(unzip_command)
 
@@ -155,18 +155,18 @@ def build_chromium_archive(platform, rev
         raise Exception(
             "Too many directories starting with 'chrome-' after extracting."
         )
     elif len(dirs) == 0:
         raise Exception(
             "Could not find any directories after extraction of chromium zip."
         )
 
-    chrome_dir = os.path.join(tmppath, dirs[0])
-    revision_file = os.path.join(chrome_dir, '.REVISION')
+    chromium_dir = os.path.join(tmppath, dirs[0])
+    revision_file = os.path.join(chromium_dir, '.REVISION')
     with open(revision_file, 'w+') as f:
         f.write(str(revision))
 
     tar_file = CHROMIUM_INFO[platform]['result']
     tar_command = ['tar', 'cjf', tar_file, '-C', tmppath, dirs[0]]
     log(
         "Added revision to %s file." % revision_file
     )
--- a/taskcluster/taskgraph/transforms/fetch.py
+++ b/taskcluster/taskgraph/transforms/fetch.py
@@ -253,12 +253,16 @@ def create_chromium_fetch_task(config, j
         cache_name = task['label'].replace('{}-'.format(config.kind), '', 1)
 
         # This adds the level to the index path automatically.
         add_optimization(
             config,
             task,
             cache_type=CACHE_TYPE,
             cache_name=cache_name,
-            digest_data=["revision={}".format(revision), "platform={}".format(platform)],
+            digest_data=[
+                "revision={}".format(revision),
+                "platform={}".format(platform),
+                "artifact_name={}".format(artifact_name),
+            ],
         )
 
     return task
--- a/testing/mozbase/mozprofile/mozprofile/profile.py
+++ b/testing/mozbase/mozprofile/mozprofile/profile.py
@@ -17,16 +17,17 @@ import mozfile
 from six import string_types, python_2_unicode_compatible
 
 from .addons import AddonManager
 from .permissions import Permissions
 from .prefs import Preferences
 
 __all__ = ['BaseProfile',
            'ChromeProfile',
+           'ChromiumProfile',
            'Profile',
            'FirefoxProfile',
            'ThunderbirdProfile',
            'create_profile']
 
 
 class BaseProfile(object):
     __metaclass__ = ABCMeta
@@ -443,32 +444,32 @@ class ThunderbirdProfile(Profile):
         'browser.tabs.warnOnClose': False,
         'browser.warnOnQuit': False,
         'browser.sessionstore.resume_from_crash': False,
         # prevents the 'new e-mail address' wizard on new profile
         'mail.provider.enabled': False,
     }
 
 
-class ChromeProfile(BaseProfile):
+class ChromiumProfile(BaseProfile):
     preference_file_names = ('Preferences',)
 
     class AddonManager(list):
         def install(self, addons):
             if isinstance(addons, string_types):
                 addons = [addons]
             self.extend(addons)
 
         @classmethod
         def is_addon(self, addon):
             # Don't include testing/profiles on Google Chrome
             return False
 
     def __init__(self, **kwargs):
-        super(ChromeProfile, self).__init__(**kwargs)
+        super(ChromiumProfile, self).__init__(**kwargs)
 
         if self.create_new:
             self.profile = os.path.join(self.profile, 'Default')
         self._reset()
 
     def _reset(self):
         if not os.path.isdir(self.profile):
             os.makedirs(self.profile)
@@ -490,18 +491,25 @@ class ChromeProfile(BaseProfile):
 
         prefs.update(preferences)
         with open(pref_file, 'w') as fh:
             prefstr = json.dumps(prefs)
             prefstr % values  # interpolate prefs with values
             fh.write(prefstr)
 
 
+class ChromeProfile(ChromiumProfile):
+    # update this if Google Chrome requires more
+    # specific profiles
+    pass
+
+
 profile_class = {
     'chrome': ChromeProfile,
+    'chromium': ChromiumProfile,
     'firefox': FirefoxProfile,
     'thunderbird': ThunderbirdProfile,
 }
 
 
 def create_profile(app, **kwargs):
     """Create a profile given an application name.
 
--- a/testing/mozbase/mozprofile/tests/test_profile.py
+++ b/testing/mozbase/mozprofile/tests/test_profile.py
@@ -11,16 +11,17 @@ import os
 import mozunit
 import pytest
 
 from mozprofile.prefs import Preferences
 from mozprofile import (
     BaseProfile,
     Profile,
     ChromeProfile,
+    ChromiumProfile,
     FirefoxProfile,
     ThunderbirdProfile,
     create_profile,
 )
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -39,16 +40,17 @@ def test_with_profile_should_cleanup_eve
             1 / 0  # will raise ZeroDivisionError
 
     # profile is cleaned
     assert not os.path.exists(profile.profile)
 
 
 @pytest.mark.parametrize('app,cls', [
     ('chrome', ChromeProfile),
+    ('chromium', ChromiumProfile),
     ('firefox', FirefoxProfile),
     ('thunderbird', ThunderbirdProfile),
     ('unknown', None)
 ])
 def test_create_profile(tmpdir, app, cls):
     path = tmpdir.strpath
 
     if cls is None:
@@ -60,16 +62,17 @@ def test_create_profile(tmpdir, app, cls
     assert isinstance(profile, BaseProfile)
     assert profile.__class__ == cls
     assert profile.profile == path
 
 
 @pytest.mark.parametrize('cls', [
     Profile,
     ChromeProfile,
+    ChromiumProfile,
 ])
 def test_merge_profile(cls):
     profile = cls(preferences={'foo': 'bar'})
     assert profile._addons == []
     assert os.path.isfile(os.path.join(profile.profile, profile.preference_file_names[0]))
 
     other_profile = os.path.join(here, 'files', 'dummy-profile')
     profile.merge(other_profile)
--- a/testing/mozbase/mozrunner/mozrunner/application.py
+++ b/testing/mozbase/mozrunner/mozrunner/application.py
@@ -8,26 +8,28 @@ from abc import ABCMeta, abstractmethod
 from distutils.spawn import find_executable
 import os
 import posixpath
 
 from mozdevice import ADBDevice
 from mozprofile import (
     Profile,
     ChromeProfile,
+    ChromiumProfile,
     FirefoxProfile,
     ThunderbirdProfile
 )
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 
 def get_app_context(appname):
     context_map = {
         'chrome': ChromeContext,
+        'chromium': ChromiumContext,
         'default': DefaultContext,
         'fennec': FennecContext,
         'firefox': FirefoxContext,
         'thunderbird': ThunderbirdContext,
     }
     if appname not in context_map:
         raise KeyError("Application '%s' not supported!" % appname)
     return context_map[appname]
@@ -143,8 +145,12 @@ class FirefoxContext(object):
 
 
 class ThunderbirdContext(object):
     profile_class = ThunderbirdProfile
 
 
 class ChromeContext(object):
     profile_class = ChromeProfile
+
+
+class ChromiumContext(object):
+    profile_class = ChromiumProfile
--- a/testing/mozbase/mozrunner/mozrunner/runners.py
+++ b/testing/mozbase/mozrunner/mozrunner/runners.py
@@ -80,16 +80,27 @@ def ChromeRunner(*args, **kwargs):
 
     :param binary: Path to Chrome binary.
     :param cmdargs: Arguments to pass into the binary.
     """
     kwargs['app_ctx'] = get_app_context('chrome')()
     return BlinkRuntimeRunner(*args, **kwargs)
 
 
+def ChromiumRunner(*args, **kwargs):
+    """
+    Create a desktop Google Chromium runner.
+
+    :param binary: Path to Chromium binary.
+    :param cmdargs: Arguments to pass into the binary.
+    """
+    kwargs['app_ctx'] = get_app_context('chromium')()
+    return BlinkRuntimeRunner(*args, **kwargs)
+
+
 def FennecEmulatorRunner(avd='mozemulator-4.3',
                          adb_path=None,
                          avd_home=None,
                          logdir=None,
                          serial=None,
                          binary=None,
                          app='org.mozilla.fennec',
                          **kwargs):
@@ -120,13 +131,14 @@ def FennecEmulatorRunner(avd='mozemulato
                    'logdir': logdir}
     return FennecRunner(device_class=EmulatorAVD,
                         device_args=device_args,
                         **kwargs)
 
 
 runners = {
     'chrome': ChromeRunner,
+    'chromium': ChromiumRunner,
     'default': Runner,
     'firefox': FirefoxRunner,
     'fennec': FennecEmulatorRunner,
     'thunderbird': ThunderbirdRunner,
 }
--- a/testing/mozbase/mozrunner/tests/conftest.py
+++ b/testing/mozbase/mozrunner/tests/conftest.py
@@ -14,38 +14,40 @@ from moztest.selftest import fixtures
 
 
 @pytest.fixture(scope='session')
 def get_binary():
     if 'BROWSER_PATH' in os.environ:
         os.environ['GECKO_BINARY_PATH'] = os.environ['BROWSER_PATH']
 
     def inner(app):
-        if app not in ('chrome', 'firefox'):
+        if app not in ('chrome', 'chromium', 'firefox'):
             pytest.xfail(reason="{} support not implemented".format(app))
 
         if app == 'firefox':
             binary = fixtures.binary()
         elif app == 'chrome':
             binary = os.environ.get('CHROME_BINARY_PATH')
+        elif app == 'chromium':
+            binary = os.environ.get('CHROMIUM_BINARY_PATH')
 
         if not binary:
             pytest.skip("could not find a {} binary".format(app))
         return binary
     return inner
 
 
-@pytest.fixture(params=['firefox', 'chrome'])
+@pytest.fixture(params=['firefox', 'chrome', 'chromium'])
 def runner(request, get_binary):
     app = request.param
     binary = get_binary(app)
 
     cmdargs = ['--headless']
-    if app == 'chrome':
-        # prevents headless chrome from exiting after loading the page
+    if app in ['chrome', 'chromium']:
+        # prevents headless chromium from exiting after loading the page
         cmdargs.append('--remote-debugging-port=9222')
         # only needed on Windows, but no harm in specifying it everywhere
         cmdargs.append('--disable-gpu')
     runner = mozrunner.runners[app](binary, cmdargs=cmdargs)
     runner.app = app
     yield runner
     runner.stop()
 
--- a/testing/mozharness/configs/raptor/android_hw_config.py
+++ b/testing/mozharness/configs/raptor/android_hw_config.py
@@ -2,17 +2,17 @@ import os
 
 config = {
     "log_name": "raptor",
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
-        "install-chrome",
+        "install-chromium-distribution",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "tooltool_cache": "/builds/tooltool_cache",
     "download_tooltool": True,
     "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     "tooltool_servers": ['https://tooltool.mozilla-releng.net/'],
--- a/testing/mozharness/configs/raptor/linux_config.py
+++ b/testing/mozharness/configs/raptor/linux_config.py
@@ -13,17 +13,17 @@ config = {
     "log_name": "raptor",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
-        "install-chrome",
+        "install-chromium-distribution",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
     "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/tooltool_cache",
 }
--- a/testing/mozharness/configs/raptor/mac_config.py
+++ b/testing/mozharness/configs/raptor/mac_config.py
@@ -16,17 +16,17 @@ config = {
     "log_name": "raptor",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
-        "install-chrome",
+        "install-chromium-distribution",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         SCREEN_RESOLUTION_CHECK,
     ],
--- a/testing/mozharness/configs/raptor/windows_config.py
+++ b/testing/mozharness/configs/raptor/windows_config.py
@@ -20,17 +20,17 @@ config = {
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
         'tooltool.py': [PYTHON, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
-        "install-chrome",
+        "install-chromium-distribution",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
     "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
     "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
     "python3_manifest": {
--- a/testing/mozharness/configs/raptor/windows_vm_config.py
+++ b/testing/mozharness/configs/raptor/windows_vm_config.py
@@ -19,17 +19,17 @@ config = {
                        '%s/scripts/mozinstall-script.py' % VENV_PATH],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
-        "install-chrome",
+        "install-chromium-distribution",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
     "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
     "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
     "python3_manifest": {
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -51,17 +51,17 @@ class Raptor(TestingMixin, MercurialScri
     config_options = [
         [["--test"],
          {"action": "store",
           "dest": "test",
           "help": "Raptor test to run"
           }],
         [["--app"],
          {"default": "firefox",
-          "choices": ["firefox", "chrome", "geckoview", "fennec", "refbrow", "fenix"],
+          "choices": ["firefox", "chrome", "chromium", "fennec", "geckoview", "refbrow", "fenix"],
           "dest": "app",
           "help": "name of the application we are testing (default: firefox)"
           }],
         [["--activity"],
          {"dest": "activity",
           "help": "name of the android activity used to launch the android app"
           }],
         [["--is-release-build"],
@@ -153,25 +153,25 @@ class Raptor(TestingMixin, MercurialScri
 
     ] + testing_config_options + copy.deepcopy(code_coverage_config_options)
 
     def __init__(self, **kwargs):
         kwargs.setdefault('config_options', self.config_options)
         kwargs.setdefault('all_actions', ['clobber',
                                           'download-and-extract',
                                           'populate-webroot',
-                                          'install-chrome',
+                                          'install-chromium-distribution',
                                           'create-virtualenv',
                                           'install',
                                           'run-tests',
                                           ])
         kwargs.setdefault('default_actions', ['clobber',
                                               'download-and-extract',
                                               'populate-webroot',
-                                              'install-chrome',
+                                              'install-chromium-distribution',
                                               'create-virtualenv',
                                               'install',
                                               'run-tests',
                                               ])
         kwargs.setdefault('config', {})
         super(Raptor, self).__init__(**kwargs)
 
         self.workdir = self.query_abs_dirs()['abs_work_dir']  # convenience
@@ -253,48 +253,69 @@ class Raptor(TestingMixin, MercurialScri
         abs_dirs = super(Raptor, self).query_abs_dirs()
         abs_dirs['abs_blob_upload_dir'] = os.path.join(abs_dirs['abs_work_dir'],
                                                        'blobber_upload_dir')
         abs_dirs['abs_test_install_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tests')
 
         self.abs_dirs = abs_dirs
         return self.abs_dirs
 
-    def install_chrome(self):
-        '''install google chrome in production; installation
+    def install_chromium_distribution(self):
+        '''install Google Chromium distribution in production; installation
         requirements depend on the platform'''
-        if self.app != "chrome":
-            self.info("Google Chrome is not required")
-            return
+        linux, mac, win = 'linux', 'mac', 'win'
+        chrome, chromium = 'chrome', 'chromium'
 
-        if self.config.get("run_local"):
-            self.info("expecting Google Chrome to be pre-installed locally")
+        available_chromium_dists = [chrome, chromium]
+        binary_location = {
+            chromium: {
+                linux: ['chrome-linux', 'chrome'],
+                mac: ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium'],
+                win: ['chrome-win', 'Chrome.exe']
+            },
+        }
+
+        if self.app == "chrome":
+            # remove this condition when integrating Google Chrome
+            raise ValueError("Google Chrome not currently integrated!")
+
+        if self.app not in available_chromium_dists:
+            self.info("Google Chrome or Chromium distributions are not required.")
             return
 
-        self.info("Getting fetched chromium build")
-        self.chrome_dest = os.path.normpath(os.path.abspath(os.environ['MOZ_FETCHES_DIR']))
+        chromium_dist = self.app
+
+        if self.config.get("run_local"):
+            self.info("expecting %s to be pre-installed locally" % chromium_dist)
+            return
 
-        if 'mac' in self.platform_name():
-            self.chrome_path = os.path.join(self.chrome_dest, 'chrome-mac', 'Chromium.app',
-                                            'Contents', 'MacOS', 'Chromium')
+        self.info("Getting fetched %s build" % chromium_dist)
+        self.chromium_dist_dest = os.path.normpath(os.path.abspath(os.environ['MOZ_FETCHES_DIR']))
 
-        elif 'linux' in self.platform_name():
-            self.chrome_path = os.path.join(self.chrome_dest, 'chrome-linux', 'chrome')
+        if mac in self.platform_name():
+            self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
+                                                   *binary_location[chromium_dist][mac])
+
+        elif linux in self.platform_name():
+            self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
+                                                   *binary_location[chromium_dist][linux])
 
         else:
-            self.chrome_path = os.path.join(self.chrome_dest, 'chrome-win', 'Chrome.exe')
+            self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
+                                                   *binary_location[chromium_dist][win])
 
-        self.info("chrome dest is: %s" % self.chrome_dest)
-        self.info("chrome path is: %s" % self.chrome_path)
+        self.info("%s dest is: %s" % (chromium_dist, self.chromium_dist_dest))
+        self.info("%s path is: %s" % (chromium_dist, self.chromium_dist_path))
 
         # now ensure chrome binary exists
-        if os.path.exists(self.chrome_path):
-            self.info("successfully installed Google Chrome to: %s" % self.chrome_path)
+        if os.path.exists(self.chromium_dist_path):
+            self.info("successfully installed %s to: %s"
+                      % (chromium_dist, self.chromium_dist_path))
         else:
-            self.info("abort: failed to install Google Chrome")
+            self.info("abort: failed to install %s" % chromium_dist)
 
     def raptor_options(self, args=None, **kw):
         """return options to raptor"""
         options = []
         kw_options = {}
 
         # binary path; if testing on firefox the binary path already came from mozharness/pro;
         # otherwise the binary path is forwarded from cmd line arg (raptor_cmd_line_args)
@@ -309,17 +330,17 @@ class Raptor(TestingMixin, MercurialScri
                 # in production ensure we have correct app name,
                 # i.e. fennec_aurora or fennec_release etc.
                 kw_options['binary'] = self.query_package_name()
                 self.info("set binary to %s instead of %s" % (kw_options['binary'], binary_path))
         else:  # running on google chrome
             if not self.run_local:
                 # when running locally we already set the chrome binary above in init; here
                 # in production we aready installed chrome, so set the binary path to our install
-                kw_options['binary'] = self.chrome_path
+                kw_options['binary'] = self.chromium_dist_path
 
         # options overwritten from **kw
         if 'test' in self.config:
             kw_options['test'] = self.config['test']
         if self.symbols_path:
             kw_options['symbolsPath'] = self.symbols_path
         if self.config.get('obj_path', None) is not None:
             kw_options['obj-path'] = self.config['obj_path']
--- a/testing/raptor/mach_commands.py
+++ b/testing/raptor/mach_commands.py
@@ -109,17 +109,22 @@ class RaptorRunner(MozbuildObject):
                     if not os.path.exists(dest):
                         os.symlink(path, dest)
                 else:
                     # Clobber the benchmark in case a recent update removed any files.
                     mozfile.remove(dest)
                     shutil.copytree(path, dest)
 
     def make_config(self):
-        default_actions = ['populate-webroot', 'install-chrome', 'create-virtualenv', 'run-tests']
+        default_actions = [
+            'populate-webroot',
+            'install-chromium-distribution',
+            'create-virtualenv',
+            'run-tests'
+        ]
         self.config = {
             'run_local': True,
             'binary_path': self.binary_path,
             'repo_path': self.topsrcdir,
             'raptor_path': self.raptor_dir,
             'obj_path': self.topobjdir,
             'log_name': 'raptor',
             'virtualenv_path': self.virtualenv_path,
--- a/testing/raptor/raptor/cmdline.py
+++ b/testing/raptor/raptor/cmdline.py
@@ -3,34 +3,44 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import absolute_import, print_function
 
 import argparse
 import os
 
 from mozlog.commandline import add_logging_group
 
-
+(FIREFOX,
+ CHROME,
+ CHROMIUM) = DESKTOP_APPS = ["firefox", "chrome", "chromium"]
+(FENNEC,
+ GECKOVIEW,
+ REFBROW,
+ FENIX) = FIREFOX_ANDROID_APPS = ["fennec", "geckoview", "refbrow", "fenix"]
+CHROMIUM_DISTROS = [CHROME, CHROMIUM]
 APPS = {
-    "firefox": {
+    FIREFOX: {
         "long_name": "Firefox Desktop"},
-    "chrome": {
+    CHROME: {
         "long_name": "Google Chrome Desktop"},
-    "fennec": {
+    CHROMIUM: {
+        "long_name": "Google Chromium Desktop"},
+    FENNEC: {
         "long_name": "Firefox Fennec on Android"},
-    "geckoview": {
+    GECKOVIEW: {
         "long_name": "Firefox Geckoview on Android",
         "default_activity": "GeckoViewActivity"},
-    "refbrow": {
+    REFBROW: {
         "long_name": "Firefox Android Components Reference Browser",
         "default_activity": "BrowserTestActivity"},
-    "fenix": {
+    FENIX: {
         "long_name": "Firefox Android Fenix Browser",
         "default_activity": "HomeActivity"}
 }
+INTEGRATED_APPS = list(APPS.keys())
 
 
 def print_all_activities():
     all_activities = []
     for next_app in APPS:
         if APPS[next_app].get('default_activity', None) is not None:
             _activity = "%s:%s" % (next_app, APPS[next_app]['default_activity'])
             all_activities.append(_activity)
@@ -109,17 +119,17 @@ def create_parser(mach_interface=False):
 
 
 def verify_options(parser, args):
     ctx = vars(args)
     if args.binary is None:
         parser.error("--binary is required!")
 
     # if running on a desktop browser make sure the binary exists
-    if args.app in ["firefox", "chrome"]:
+    if args.app in DESKTOP_APPS:
         if not os.path.isfile(args.binary):
             parser.error("{binary} does not exist!".format(**ctx))
 
     # if geckoProfile specified but not running on Firefox, not supported
     if args.gecko_profile is True and args.app != "firefox":
         parser.error("Gecko profiling is only supported when running raptor on Firefox!")
 
     # if --power-test specified, must be on geckoview/android with --host specified.
@@ -156,23 +166,27 @@ class _StopAction(argparse.Action):
             option_strings=option_strings,
             dest=dest,
             default=default,
             nargs=0,
             help=help)
 
 
 class _PrintTests(_StopAction):
+    def __init__(self, integrated_apps=INTEGRATED_APPS, *args, **kwargs):
+        super(_PrintTests, self).__init__(*args, **kwargs)
+        self.integrated_apps = integrated_apps
+
     def __call__(self, parser, namespace, values, option_string=None):
         from manifestparser import TestManifest
 
         here = os.path.abspath(os.path.dirname(__file__))
         raptor_ini = os.path.join(here, 'raptor.ini')
 
-        for _app in ["firefox", "chrome", "fennec", "geckoview", "refbrow", "fenix"]:
+        for _app in self.integrated_apps:
             test_manifest = TestManifest([raptor_ini], strict=False)
             info = {"app": _app}
             available_tests = test_manifest.active_tests(exists=False,
                                                          disabled=False,
                                                          filters=[self.filter_app],
                                                          **info)
             if len(available_tests) == 0:
                 # none for that app, skip to next
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -41,17 +41,19 @@ for path in paths:
 try:
     from mozbuild.base import MozbuildObject
 
     build = MozbuildObject.from_environment(cwd=here)
 except ImportError:
     build = None
 
 from benchmark import Benchmark
-from cmdline import parse_args
+from cmdline import (parse_args,
+                     FIREFOX_ANDROID_APPS,
+                     CHROMIUM_DISTROS)
 from control_server import RaptorControlServer
 from gen_test_config import gen_test_config
 from outputhandler import OutputHandler
 from manifest import get_raptor_test_list
 from mozproxy import get_playback
 from results import RaptorResultsHandler
 from gecko_profile import GeckoProfile
 from power import init_android_power_test, finish_android_power_test
@@ -88,17 +90,17 @@ class Raptor(object):
         self.control_server = None
         self.playback = None
         self.benchmark = None
         self.benchmark_port = 0
         self.gecko_profiler = None
         self.post_startup_delay = post_startup_delay
         self.device = None
         self.profile_class = app
-        self.firefox_android_apps = ['fennec', 'geckoview', 'refbrow', 'fenix']
+        self.firefox_android_apps = FIREFOX_ANDROID_APPS
 
         # debug mode is currently only supported when running locally
         self.debug_mode = debug_mode if self.config['run_local'] else False
 
         # if running debug-mode reduce the pause after browser startup
         if self.debug_mode:
             self.post_startup_delay = min(self.post_startup_delay, 3000)
             self.log.info("debug-mode enabled, reducing post-browser startup pause to %d ms"
@@ -236,17 +238,18 @@ class Raptor(object):
 
     def remove_raptor_webext(self):
         # remove the raptor webext; as it must be reloaded with each subtest anyway
         self.log.info("removing webext %s" % self.raptor_webext)
         if self.config['app'] in ['firefox', 'geckoview', 'fennec', 'refbrow', 'fenix']:
             self.profile.addons.remove_addon(self.webext_id)
 
         # for chrome the addon is just a list (appended to cmd line)
-        if self.config['app'] in ["chrome", "chrome-android"]:
+        chrome_apps = CHROMIUM_DISTROS + ["chrome-android", "chromium-android"]
+        if self.config['app'] in chrome_apps:
             self.profile.addons.remove(self.raptor_webext)
 
     def set_test_browser_prefs(self, test_prefs):
         # if the test has any specific browser prefs specified, set those in browser profiile
         if self.config['app'] == "firefox":
             self.profile.set_preferences(json.loads(test_prefs))
         else:
             self.log.info("preferences were configured for the test, \
@@ -824,17 +827,17 @@ def main(args=sys.argv[1:]):
         sys.exit(1)
 
     LOG.info("raptor tests scheduled to run:")
     for next_test in raptor_test_list:
         LOG.info(next_test['name'])
 
     if args.app == "firefox":
         raptor_class = RaptorDesktopFirefox
-    elif args.app == "chrome":
+    elif args.app in CHROMIUM_DISTROS:
         raptor_class = RaptorDesktopChrome
     else:
         raptor_class = RaptorAndroid
 
     raptor = raptor_class(args.app,
                           args.binary,
                           run_local=args.run_local,
                           obj_path=args.obj_path,
--- a/testing/raptor/raptor/tests/raptor-assorted-dom.ini
+++ b/testing/raptor/raptor/tests/raptor-assorted-dom.ini
@@ -9,8 +9,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
 
 [raptor-assorted-dom-firefox]
 apps = firefox
 
 [raptor-assorted-dom-chrome]
 apps = chrome
+
+[raptor-assorted-dom-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-motionmark-animometer.ini
+++ b/testing/raptor/raptor/tests/raptor-motionmark-animometer.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# motionmark benchmark for firefox and chrome
+# motionmark benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/MotionMark/developer.html?test-interval=15&display=minimal&tiles=big&controller=fixed&frame-rate=30&kalman-process-error=1&kalman-measurement-error=4&time-measurement=performance&suite-name=Animometer&raptor=true&oskey={platform}
 page_cycles = 5
 page_timeout = 600000
 unit = score
 lower_is_better = false
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-motionmark-animometer-firefox]
 apps = firefox
 
 [raptor-motionmark-animometer-chrome]
 apps = chrome
+
+[raptor-motionmark-animometer-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini
+++ b/testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# motionmark benchmark for firefox and chrome
+# motionmark benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/MotionMark/developer.html?test-interval=15&display=minimal&tiles=big&controller=fixed&frame-rate=30&kalman-process-error=1&kalman-measurement-error=4&time-measurement=performance&suite-name=HTMLsuite&raptor=true&oskey={platform}
 page_cycles = 5
 page_timeout = 600000
 unit = score
 lower_is_better = false
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-motionmark-htmlsuite-firefox]
 apps = firefox
 
 [raptor-motionmark-htmlsuite-chrome]
 apps = chrome
+
+[raptor-motionmark-htmlsuite-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-speedometer.ini
+++ b/testing/raptor/raptor/tests/raptor-speedometer.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# speedometer benchmark for firefox and chrome
+# speedometer benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/Speedometer/index.html?raptor
 page_cycles = 5
 page_timeout = 180000
 unit = score
 subtest_unit = ms
@@ -18,16 +18,19 @@ gecko_profile_interval = 1
 gecko_profile_entries = 14000000
 
 [raptor-speedometer-firefox]
 apps = firefox
 
 [raptor-speedometer-chrome]
 apps = chrome
 
+[raptor-speedometer-chromium]
+apps = chromium
+
 [raptor-speedometer-geckoview]
 page_timeout = 900000  # 15 min
 page_cycles = 1
 apps = geckoview
 
 [raptor-speedometer-fennec]
 page_timeout = 900000  # 15 min
 page_cycles = 1
--- a/testing/raptor/raptor/tests/raptor-stylebench.ini
+++ b/testing/raptor/raptor/tests/raptor-stylebench.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# speedometer benchmark for firefox and chrome
+# speedometer benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/StyleBench/index.html?raptor
 page_cycles = 5
 page_timeout = 120000
 unit = score
 lower_is_better = false
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-stylebench-firefox]
 apps = firefox
 
 [raptor-stylebench-chrome]
 apps = chrome
+
+[raptor-stylebench-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-sunspider.ini
+++ b/testing/raptor/raptor/tests/raptor-sunspider.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# sunspider benchmark for firefox and chrome
+# sunspider benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/SunSpider/sunspider-1.0.1/sunspider-1.0.1/driver.html?raptor
 page_cycles = 5
 page_timeout = 35000
 unit = ms
 lower_is_better = true
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-sunspider-firefox]
 apps = firefox
 
 [raptor-sunspider-chrome]
 apps = chrome
+
+[raptor-sunspider-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-tp6-1.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-1.ini
@@ -64,8 +64,32 @@ test_url = https://www.google.com/#hl=en
 playback_recordings = google-search.mp
 measure = fcp, loadtime
 
 [raptor-tp6-youtube-chrome]
 apps = chrome
 test_url = https://www.youtube.com
 playback_recordings = youtube.mp
 measure = fcp, loadtime
+
+[raptor-tp6-amazon-chromium]
+apps = chromium
+test_url = https://www.amazon.com/s/url=search-alias%3Daps&field-keywords=laptop
+playback_recordings = amazon.mp
+measure = fcp, loadtime
+
+[raptor-tp6-facebook-chromium]
+apps = chromium
+test_url = https://www.facebook.com
+playback_recordings = facebook.mp
+measure = fcp, loadtime
+
+[raptor-tp6-google-chromium]
+apps = chromium
+test_url = https://www.google.com/#hl=en&q=barack+obama
+playback_recordings = google-search.mp
+measure = fcp, loadtime
+
+[raptor-tp6-youtube-chromium]
+apps = chromium
+test_url = https://www.youtube.com
+playback_recordings = youtube.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-10.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-10.ini
@@ -40,8 +40,23 @@ measure = fcp, loadtime
 disabled = Bug 1542757 - Investigate and fix TEST-UNEXPECTED-FAIL: test 'raptor-tp6-paypal-chrome'
 
 [raptor-tp6-tumblr-chrome]
 apps = chrome
 test_url = https://www.tumblr.com/dashboard
 playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
 playback_recordings = tumblr.mp
 measure = fcp, loadtime
+
+[raptor-tp6-paypal-chromium]
+apps = chromium
+test_url = https://www.paypal.com/myaccount/summary/
+playback_pageset_manifest = mitmproxy-recordings-raptor-paypal.manifest
+playback_recordings = paypal.mp
+measure = fcp, loadtime
+disabled = Bug 1542757 - Investigate and fix TEST-UNEXPECTED-FAIL: test 'raptor-tp6-paypal-chrome'
+
+[raptor-tp6-tumblr-chromium]
+apps = chromium
+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/raptor-tp6-2.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-2.ini
@@ -48,8 +48,26 @@ test_url = https://docs.google.com/sprea
 playback_recordings = google-sheets.mp
 measure = fcp, loadtime
 
 [raptor-tp6-slides-chrome]
 apps = chrome
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
 playback_recordings = google-slides.mp
 measure = fcp, loadtime
+
+[raptor-tp6-docs-chromium]
+apps = chromium
+test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
+playback_recordings = google-docs.mp
+measure = fcp, loadtime
+
+[raptor-tp6-sheets-chromium]
+apps = chromium
+test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
+playback_recordings = google-sheets.mp
+measure = fcp, loadtime
+
+[raptor-tp6-slides-chromium]
+apps = chromium
+test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
+playback_recordings = google-slides.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-3.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-3.ini
@@ -49,8 +49,27 @@ playback_recordings = imgur.mp
 measure = fcp, loadtime
 disabled = Bug 1529918 - raptor-tp6-imgur-chrome fails to load with latest Chromium update
 
 [raptor-tp6-wikia-chrome]
 apps = chrome
 test_url = http://fandom.wikia.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
 playback_recordings = wikia.mp
 measure = fcp, loadtime
+
+[raptor-tp6-imdb-chromium]
+apps = chromium
+test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
+playback_recordings = imdb.mp
+measure = fcp, loadtime
+
+[raptor-tp6-imgur-chromium]
+apps = chromium
+test_url = https://imgur.com/gallery/m5tYJL6
+playback_recordings = imgur.mp
+measure = fcp, loadtime
+disabled = Bug 1529918 - raptor-tp6-imgur-chrome fails to load with latest Chromium update
+
+[raptor-tp6-wikia-chromium]
+apps = chromium
+test_url = http://fandom.wikia.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
+playback_recordings = wikia.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-4.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-4.ini
@@ -36,8 +36,20 @@ test_url = https://www.bing.com/search?q
 playback_recordings = bing.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yandex-chrome]
 apps = chrome
 test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
 playback_recordings = yandex.mp
 measure = fcp, loadtime
+
+[raptor-tp6-bing-chromium]
+apps = chromium
+test_url = https://www.bing.com/search?q=barack+obama
+playback_recordings = bing.mp
+measure = fcp, loadtime
+
+[raptor-tp6-yandex-chromium]
+apps = chromium
+test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
+playback_recordings = yandex.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-5.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-5.ini
@@ -37,8 +37,20 @@ test_url = https://www.apple.com/macbook
 playback_recordings = apple.mp
 measure = fcp, loadtime
 
 [raptor-tp6-microsoft-chrome]
 apps = chrome
 test_url = https://www.microsoft.com/en-us/windows/get-windows-10
 playback_recordings = microsoft.mp
 measure = fcp, loadtime
+
+[raptor-tp6-apple-chromium]
+apps = chromium
+test_url = https://www.apple.com/macbook-pro/
+playback_recordings = apple.mp
+measure = fcp, loadtime
+
+[raptor-tp6-microsoft-chromium]
+apps = chromium
+test_url = https://www.microsoft.com/en-us/windows/get-windows-10
+playback_recordings = microsoft.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-6.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-6.ini
@@ -38,8 +38,21 @@ playback_recordings = reddit.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-news-chrome]
 apps = chrome
 test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
 playback_pageset_manifest =  mitmproxy-recordings-raptor-yahoo-news.manifest
 playback_recordings = yahoo-news.mp
 measure = fcp, loadtime
+
+[raptor-tp6-reddit-chromium]
+apps = chromium
+test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
+playback_recordings = reddit.mp
+measure = fcp, loadtime
+
+[raptor-tp6-yahoo-news-chromium]
+apps = chromium
+test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
+playback_pageset_manifest =  mitmproxy-recordings-raptor-yahoo-news.manifest
+playback_recordings = yahoo-news.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-7.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-7.ini
@@ -52,8 +52,28 @@ playback_recordings = twitter.mp
 measure = fcp, loadtime
 
 [raptor-tp6-yahoo-mail-chrome]
 apps = chrome
 test_url = https://mail.yahoo.com/
 playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
 playback_recordings = yahoo-mail.mp
 measure = fcp, loadtime
+
+[raptor-tp6-instagram-chromium]
+apps = chromium
+test_url = https://www.instagram.com/
+playback_recordings = instagram.mp
+measure = fcp, loadtime
+
+[raptor-tp6-twitter-chromium]
+apps = chromium
+test_url = https://twitter.com/BarackObama
+playback_pageset_manifest = mitmproxy-recordings-raptor-twitter.manifest
+playback_recordings = twitter.mp
+measure = fcp, loadtime
+
+[raptor-tp6-yahoo-mail-chromium]
+apps = chromium
+test_url = https://mail.yahoo.com/
+playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
+playback_recordings = yahoo-mail.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
@@ -68,8 +68,36 @@ playback_recordings = ebay.mp
 measure = fcp, loadtime
 
 [raptor-tp6-wikipedia-mitm-404-recordings-404-chrome]
 apps = chrome
 test_url =  https://en.wikipedia.org/wiki/Barack_Obama
 playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
 playback_recordings = wikipedia.mp
 measure = fcp, loadtime
+
+[raptor-tp6-ebay-mitm-404-recordings-202-chromium]
+apps = chromium
+test_url = https://www.ebay.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
+playback_recordings = ebay.mp
+measure = fcp, loadtime
+
+[raptor-tp6-wikipedia-mitm-404-recordings-202-chromium]
+apps = chromium
+test_url =  https://en.wikipedia.org/wiki/Barack_Obama
+playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
+playback_recordings = wikipedia.mp
+measure = fcp, loadtime
+
+[raptor-tp6-ebay-mitm-404-recordings-404-chromium]
+apps = chromium
+test_url = https://www.ebay.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-ebay-404.manifest
+playback_recordings = ebay.mp
+measure = fcp, loadtime
+
+[raptor-tp6-wikipedia-mitm-404-recordings-404-chromium]
+apps = chromium
+test_url =  https://en.wikipedia.org/wiki/Barack_Obama
+playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
+playback_recordings = wikipedia.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-8.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-8.ini
@@ -39,8 +39,22 @@ playback_recordings = ebay.mp
 measure = fcp, loadtime
 
 [raptor-tp6-wikipedia-chrome]
 apps = chrome
 test_url =  https://en.wikipedia.org/wiki/Barack_Obama
 playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
 playback_recordings = wikipedia.mp
 measure = fcp, loadtime
+
+[raptor-tp6-ebay-chromium]
+apps = chromium
+test_url = https://www.ebay.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
+playback_recordings = ebay.mp
+measure = fcp, loadtime
+
+[raptor-tp6-wikipedia-chromium]
+apps = chromium
+test_url =  https://en.wikipedia.org/wiki/Barack_Obama
+playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
+playback_recordings = wikipedia.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6-9.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6-9.ini
@@ -39,8 +39,22 @@ playback_recordings = google-mail.mp
 measure = fcp, loadtime
 
 [raptor-tp6-pinterest-chrome]
 apps = chrome
 test_url = https://pinterest.com/
 playback_pageset_manifest = mitmproxy-recordings-raptor-pinterest.manifest
 playback_recordings = pinterest.mp
 measure = fcp, loadtime
+
+[raptor-tp6-google-mail-chromium]
+apps = chromium
+test_url = https://mail.google.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-google-mail.manifest
+playback_recordings = google-mail.mp
+measure = fcp, loadtime
+
+[raptor-tp6-pinterest-chromium]
+apps = chromium
+test_url = https://pinterest.com/
+playback_pageset_manifest = mitmproxy-recordings-raptor-pinterest.manifest
+playback_recordings = pinterest.mp
+measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-unity-webgl.ini
+++ b/testing/raptor/raptor/tests/raptor-unity-webgl.ini
@@ -10,16 +10,19 @@ gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-unity-webgl-firefox]
 apps = firefox
 
 [raptor-unity-webgl-chrome]
 apps = chrome
 
+[raptor-unity-webgl-chromium]
+apps = chromium
+
 [raptor-unity-webgl-geckoview]
 page_timeout = 900000  # 15 min
 page_cycles = 1
 apps = geckoview
 
 [raptor-unity-webgl-refbrow]
 page_timeout = 900000  # 15 min
 page_cycles = 1
--- a/testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-godot benchmark for firefox and chrome
+# Wasm-godot benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://localhost:<port>/wasm-godot/index.html
 page_cycles = 5
 page_timeout = 120000
 unit = ms
 lower_is_better = true
--- a/testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini
@@ -1,22 +1,22 @@
 # 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/.
 
-# Wasm-Godot benchmark for firefox and chrome
+# Wasm-Godot benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
-test_url = http://localhost:<port>/wasm-godot/index.html
+test_url = http://localhost:<port>/wasm-godot/index.html
 page_cycles = 5
 page_timeout = 120000
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
-newtab_per_cycle = true
-gecko_profile_interval = 1
-gecko_profile_entries = 8000000
+newtab_per_cycle = true
+gecko_profile_interval = 1
+gecko_profile_entries = 8000000
 
 [raptor-wasm-godot-cranelift-firefox]
 apps = firefox
 preferences = {"javascript.options.wasm_baselinejit": false,
                "javascript.options.wasm_cranelift": true}
--- a/testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-godot benchmark for firefox and chrome
+# Wasm-godot benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://localhost:<port>/wasm-godot/index.html
 page_cycles = 5
 page_timeout = 120000
 unit = ms
 lower_is_better = true
--- a/testing/raptor/raptor/tests/raptor-wasm-godot.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-godot benchmark for firefox and chrome
+# Wasm-godot benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://localhost:<port>/wasm-godot/index.html
 page_cycles = 5
 page_timeout = 120000
 unit = ms
 lower_is_better = true
@@ -16,8 +16,11 @@ newtab_per_cycle = true
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
 
 [raptor-wasm-godot-firefox]
 apps = firefox
 
 [raptor-wasm-godot-chrome]
 apps = chrome
+
+[raptor-wasm-godot-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-Misc benchmark for firefox and chrome
+# Wasm-Misc benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/wasm-misc/index.html?raptor
 page_cycles = 5
 page_timeout = 1200000
 unit = ms
 lower_is_better = true
--- a/testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-Misc benchmark for firefox and chrome
+# Wasm-Misc benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://localhost:<port>/wasm-misc/index.html?raptor
 page_cycles = 5
 page_timeout = 1200000
 unit = ms
 lower_is_better = true
--- a/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-Misc benchmark for firefox and chrome
+# Wasm-Misc benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/wasm-misc/index.html?raptor
 page_cycles = 5
 page_timeout = 1200000
 unit = ms
 lower_is_better = true
--- a/testing/raptor/raptor/tests/raptor-wasm-misc.ini
+++ b/testing/raptor/raptor/tests/raptor-wasm-misc.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# Wasm-Misc benchmark for firefox and chrome
+# Wasm-Misc benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/wasm-misc/index.html?raptor
 page_cycles = 5
 page_timeout = 1200000
 unit = ms
 lower_is_better = true
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 4000000
 
 [raptor-wasm-misc-firefox]
 apps = firefox
 
 [raptor-wasm-misc-chrome]
 apps = chrome
+
+[raptor-wasm-misc-chromium]
+apps = chromium
--- a/testing/raptor/raptor/tests/raptor-webaudio.ini
+++ b/testing/raptor/raptor/tests/raptor-webaudio.ini
@@ -1,13 +1,13 @@
 # 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/.
 
-# speedometer benchmark for firefox and chrome
+# speedometer benchmark for firefox and chromium distributions
 
 [DEFAULT]
 type =  benchmark
 test_url = http://<host>:<port>/webaudio/index.html?raptor
 page_cycles = 5
 page_timeout = 180000
 unit = score
 lower_is_better = true
@@ -15,8 +15,11 @@ alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 4000000
 
 [raptor-webaudio-firefox]
 apps = firefox
 
 [raptor-webaudio-chrome]
 apps = chrome
+
+[raptor-webaudio-chromium]
+apps = chromium
--- a/testing/raptor/test/test_manifest.py
+++ b/testing/raptor/test/test_manifest.py
@@ -41,16 +41,25 @@ VALID_MANIFESTS = [{'apps': 'firefox',
                     'type': 'benchmark',
                     'page_cycles': 5,
                     'test_url': 'http://www.test-url/goes/here',
                     'measure': 'fcp',
                     'unit': 'score',
                     'lower_is_better': False,
                     'alert_threshold': 2.0,
                     'manifest': 'valid_details_1'},
+                   {'apps': 'chromium',
+                    'type': 'benchmark',
+                    'page_cycles': 5,
+                    'test_url': 'http://www.test-url/goes/here',
+                    'measure': 'fcp',
+                    'unit': 'score',
+                    'lower_is_better': False,
+                    'alert_threshold': 2.0,
+                    'manifest': 'valid_details_1'},
                    {'apps': 'geckoview',
                     'type': 'pageload',
                     'cold': True,
                     'browser_cycles': 10,
                     'page_cycles': 1,
                     'test_url': 'http://www.test-url/goes/here',
                     'measure': 'fcp',
                     'unit': 'score',
@@ -75,33 +84,43 @@ INVALID_MANIFESTS = [{'apps': 'firefox',
                       'page_cycles': 25,
                       'test_url': 'http://www.test-url/goes/here',
                       'measure': 'fnbpaint, fcp',
                       'unit': 'ms',
                       'lower_is_better': True,
                       'alert_threshold': 2.0,
                       'playback': 'mitmproxy',
                       'manifest': 'invalid_details_1'},
+                     {'apps': 'chromium',
+                      'type': 'pageload',
+                      'page_cycles': 25,
+                      'test_url': 'http://www.test-url/goes/here',
+                      'measure': 'fnbpaint, fcp',
+                      'unit': 'ms',
+                      'lower_is_better': True,
+                      'alert_threshold': 2.0,
+                      'playback': 'mitmproxy',
+                      'manifest': 'invalid_details_1'},
                      {'apps': 'firefox',
                       'type': 'pageload',
                       'page_cycles': 25,
                       'test_url': 'http://www.test-url/goes/here',
                       'measure': 'fnbpaint, fcp',
                       'alert_on': 'nope',
                       'unit': 'ms',
                       'lower_is_better': True,
                       'alert_threshold': 2.0,
                       'playback': 'mitmproxy',
                       'playback_binary_manifest': 'binary.manifest',
                       'playback_pageset_manifest': 'pageset.manifest',
                       'playback_recordings': 'recorded_site.mp',
                       'manifest': 'invalid_details_2'}]
 
 
-@pytest.mark.parametrize('app', ['firefox', 'chrome', 'geckoview', 'refbrow', 'fenix'])
+@pytest.mark.parametrize('app', ['firefox', 'chrome', 'chromium', 'geckoview', 'refbrow', 'fenix'])
 def test_get_browser_test_list(app):
     test_list = get_browser_test_list(app, run_local=True)
     if app != "fenix":
         assert len(test_list) > 0
     else:
         assert len(test_list) == 0
 
 
--- a/testing/raptor/test/test_raptor.py
+++ b/testing/raptor/test/test_raptor.py
@@ -37,16 +37,17 @@ class TestBrowserThread(threading.Thread
                 self.raptor_instance.run_test(self.test, self.timeout)
             except BaseException:
                 self.exc = sys.exc_info()
 
 
 @pytest.mark.parametrize("raptor_class, app_name", [
                          [RaptorDesktopFirefox, "firefox"],
                          [RaptorDesktopChrome, "chrome"],
+                         [RaptorDesktopChrome, "chromium"],
                          [RaptorAndroid, "fennec"],
                          [RaptorAndroid, "geckoview"],
                          ])
 def test_create_profile(options, raptor_class, app_name, get_prefs):
     options['app'] = app_name
     raptor = raptor_class(**options)
 
     if app_name in ["fennec", "geckoview"]:
@@ -88,16 +89,17 @@ def test_start_and_stop_server(raptor):
 
     raptor.clean_up()
     assert not raptor.control_server._server_thread.is_alive()
 
 
 @pytest.mark.parametrize('app', [
     'firefox',
     pytest.mark.xfail('chrome'),
+    pytest.mark.xfail('chromium'),
 ])
 def test_start_browser(get_binary, app):
     binary = get_binary(app)
     assert binary
 
     raptor = RaptorDesktopFirefox(app, binary, post_startup_delay=0)
     raptor.create_browser_profile()
     raptor.create_browser_handler()