Bug 1472740 - Avoid LWT aliases in theme API tests that are not specifically about LWT aliases. r=ntim,jaws
authorLuca Greco <lgreco@mozilla.com>
Mon, 26 Nov 2018 16:10:36 +0000
changeset 507970 5ad19f2159391c4299c6b665794068e7567f38e3
parent 507969 7b5c486601e568aaa8538d7286dc3bd8be84ad8a
child 507971 f988af9437f591cc5c7d3917ba370e2edc82d1a6
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersntim, jaws
bugs1472740
milestone65.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 1472740 - Avoid LWT aliases in theme API tests that are not specifically about LWT aliases. r=ntim,jaws This patch replace the LWT aliases with their related non-deprecated alias in all the theme API tests that don't seem to be specifically testing the LWT aliases (e.g. browser_ext_themes_lwtsupport.js is leaved unmodified for this reason). The main reason to replace them in the "not stricly LWT-related" tests before their final removal (currently planned for Firefox 69) is that the deprecation warnings will make these tests more noisy (and so they may be making harder to investigate failures, without any actual gain in terms of coverage). Depends on D12297 Differential Revision: https://phabricator.services.mozilla.com/D12783
browser/components/extensions/test/browser/browser_ext_browserAction_theme_icons.js
toolkit/components/extensions/test/browser/browser_ext_management_themes.js
toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js
toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js
toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js
toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_getCurrent.js
toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_onUpdated.js
toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
toolkit/components/extensions/test/browser/browser_ext_themes_findbar.js
toolkit/components/extensions/test/browser/browser_ext_themes_getCurrent_differentExt.js
toolkit/components/extensions/test/browser/browser_ext_themes_multiple_backgrounds.js
toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js
toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
toolkit/components/extensions/test/browser/browser_ext_themes_separators.js
toolkit/components/extensions/test/browser/browser_ext_themes_static_onUpdated.js
toolkit/components/extensions/test/browser/browser_ext_themes_tab_line.js
toolkit/components/extensions/test/browser/browser_ext_themes_tab_loading.js
toolkit/components/extensions/test/browser/browser_ext_themes_tab_selected.js
toolkit/components/extensions/test/browser/browser_ext_themes_tab_separators.js
toolkit/components/extensions/test/browser/browser_ext_themes_tab_text.js
toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields.js
toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields_focus.js
toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_colors.js
toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_icons.js
toolkit/components/extensions/test/browser/browser_ext_themes_toolbars.js
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_theme_icons.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_theme_icons.js
@@ -1,20 +1,20 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 const LIGHT_THEME_COLORS = {
-  "accentcolor": "#FFF",
-  "textcolor": "#000",
+  "frame": "#FFF",
+  "tab_background_text": "#000",
 };
 
 const DARK_THEME_COLORS = {
-  "accentcolor": "#000",
-  "textcolor": "#FFF",
+  "frame": "#000",
+  "tab_background_text": "#FFF",
 };
 
 const TOOLBAR_MAPPING = {
   "navbar": "nav-bar",
   "tabstrip": "TabsToolbar",
 };
 
 async function testBrowserAction(extension, expectedIcon) {
@@ -137,20 +137,20 @@ add_task(async function browseraction_th
       "size": 32,
     }],
     withDefaultIcon: false,
   });
 });
 
 add_task(async function browseraction_theme_icons_different_toolbars() {
   let themeData = {
-    "accentcolor": "#000",
-    "textcolor": "#fff",
+    "frame": "#000",
+    "tab_background_text": "#fff",
     "toolbar": "#fff",
-    "toolbar_text": "#000",
+    "bookmark_text": "#000",
   };
   await testStaticTheme({
     themeData,
     expectedIcon: "dark",
     themeIcons: [{
       "light": "light.png",
       "dark": "dark.png",
       "size": 19,
--- a/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
@@ -12,17 +12,17 @@ add_task(async function test_management_
 
   let theme = ExtensionTestUtils.loadExtension({
     manifest: {
       "name": "Simple theme test",
       "version": "1.0",
       "description": "test theme",
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
     useAddonManager: "temporary",
   });
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js
@@ -1,27 +1,27 @@
 "use strict";
 
 /* globals InspectorUtils */
 
-// Case 1 - When there is a headerURL image and additional_backgrounds_alignment is not specified.
+// Case 1 - When there is a theme_frame image and additional_backgrounds_alignment is not specified.
 // So background-position should default to "right top"
 add_task(async function test_default_additional_backgrounds_alignment() {
   const RIGHT_TOP = "100% 0%";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
           "additional_backgrounds": ["image1.png", "image1.png"],
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
 
   });
@@ -29,49 +29,49 @@ add_task(async function test_default_add
   await extension.startup();
 
   let docEl = document.documentElement;
   let rootCS = window.getComputedStyle(docEl);
 
   Assert.equal(
     rootCS.getPropertyValue("background-position"),
     RIGHT_TOP,
-    "root only contains headerURL alignment property"
+    "root only contains theme_frame alignment property"
   );
 
 
   let toolbox = document.querySelector("#navigator-toolbox");
   let toolboxCS = window.getComputedStyle(toolbox);
 
   Assert.equal(
     toolboxCS.getPropertyValue("background-position"),
     RIGHT_TOP,
     toolbox.id + " only contains default additional backgrounds alignment property"
   );
 
   await extension.unload();
 });
 
 
-// Case 2 - When there is a headerURL image and additional_backgrounds_alignment is specified.
+// Case 2 - When there is a theme_frame image and additional_backgrounds_alignment is specified.
 add_task(async function test_additional_backgrounds_alignment() {
   const LEFT_BOTTOM = "0% 100%";
   const CENTER_CENTER = "50% 50%";
   const RIGHT_TOP = "100% 0%";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
           "additional_backgrounds": ["image1.png", "image1.png", "image1.png"],
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
         "properties": {
           additional_backgrounds_alignment: ["left bottom", "center center", "right top"],
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
@@ -82,17 +82,17 @@ add_task(async function test_additional_
   await extension.startup();
 
   let docEl = document.documentElement;
   let rootCS = window.getComputedStyle(docEl);
 
   Assert.equal(
     rootCS.getPropertyValue("background-position"),
     RIGHT_TOP,
-    "root only contains headerURL alignment property"
+    "root only contains theme_frame alignment property"
   );
 
 
   let toolbox = document.querySelector("#navigator-toolbox");
   let toolboxCS = window.getComputedStyle(toolbox);
 
   Assert.equal(
     toolboxCS.getPropertyValue("background-position"),
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
@@ -1,20 +1,20 @@
 "use strict";
 
-add_task(async function test_alpha_accentcolor() {
+add_task(async function test_alpha_frame_color() {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": "rgba(230, 128, 0, 0.1)",
-          "textcolor": TEXT_COLOR,
+          "frame": "rgba(230, 128, 0, 0.1)",
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js
@@ -19,21 +19,21 @@ add_task(async function test_popup_styli
   const POPUP_BACKGROUND_COLOR = "#FF0000";
   const POPUP_TEXT_COLOR = "#008000";
   const POPUP_BORDER_COLOR = "#0000FF";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "popup": POPUP_BACKGROUND_COLOR,
           "popup_text": POPUP_TEXT_COLOR,
           "popup_border": POPUP_BORDER_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js
@@ -75,21 +75,21 @@ add_task(async function setup() {
 });
 
 add_task(async function test_popup_url() {
   // Load extension with brighttext not set
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "popup": POPUP_COLOR,
           "popup_border": POPUP_BORDER_COLOR,
           "popup_text": POPUP_TEXT_COLOR_DARK,
           "popup_highlight": POPUP_SELECTED_COLOR,
           "popup_highlight_text": POPUP_SELECTED_TEXT_COLOR,
         },
       },
     },
@@ -174,21 +174,21 @@ add_task(async function test_popup_url()
                false,
                "lwt-popup-darktext attribute should be removed");
 
   // Load a manifest with popup_text being bright. Test for bright text properties.
   extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "popup": POPUP_COLOR,
           "popup_text": POPUP_TEXT_COLOR_BRIGHT,
           "popup_highlight": POPUP_SELECTED_COLOR,
           "popup_highlight_text": POPUP_SELECTED_TEXT_COLOR,
         },
       },
     },
     files: {
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_getCurrent.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_getCurrent.js
@@ -14,31 +14,31 @@ add_task(async function test_get_current
       const ACCENT_COLOR_1 = "#a14040";
       const TEXT_COLOR_1 = "#fac96e";
 
       const ACCENT_COLOR_2 = "#03fe03";
       const TEXT_COLOR_2 = "#0ef325";
 
       const theme1 = {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR_1,
-          "textcolor": TEXT_COLOR_1,
+          "frame": ACCENT_COLOR_1,
+          "tab_background_text": TEXT_COLOR_1,
         },
       };
 
       const theme2 = {
         "images": {
-          "headerURL": "image2.png",
+          "theme_frame": "image2.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR_2,
-          "textcolor": TEXT_COLOR_2,
+          "frame": ACCENT_COLOR_2,
+          "tab_background_text": TEXT_COLOR_2,
         },
       };
 
       function ensureWindowFocused(winId) {
         browser.test.log("Waiting for focused window to be " + winId);
         return new Promise(async (resolve) => {
           let listener = windowId => {
             if (windowId === winId) {
@@ -56,36 +56,36 @@ add_task(async function test_get_current
             browser.windows.onFocusChanged.removeListener(listener);
             resolve();
           }
         });
       }
 
       function testTheme1(returnedTheme) {
         browser.test.assertTrue(
-          returnedTheme.images.headerURL.includes("image1.png"),
-          "Theme 1 header URL should be applied");
+          returnedTheme.images.theme_frame.includes("image1.png"),
+          "Theme 1 theme_frame image should be applied");
         browser.test.assertEq(
-          ACCENT_COLOR_1, returnedTheme.colors.accentcolor,
-          "Theme 1 accent color should be applied");
+          ACCENT_COLOR_1, returnedTheme.colors.frame,
+          "Theme 1 frame color should be applied");
         browser.test.assertEq(
-          TEXT_COLOR_1, returnedTheme.colors.textcolor,
-          "Theme 1 text color should be applied");
+          TEXT_COLOR_1, returnedTheme.colors.tab_background_text,
+          "Theme 1 tab_background_text color should be applied");
       }
 
       function testTheme2(returnedTheme) {
         browser.test.assertTrue(
-          returnedTheme.images.headerURL.includes("image2.png"),
-          "Theme 2 header URL should be applied");
+          returnedTheme.images.theme_frame.includes("image2.png"),
+          "Theme 2 theme_frame image should be applied");
         browser.test.assertEq(
-          ACCENT_COLOR_2, returnedTheme.colors.accentcolor,
-          "Theme 2 accent color should be applied");
+          ACCENT_COLOR_2, returnedTheme.colors.frame,
+          "Theme 2 frame color should be applied");
         browser.test.assertEq(
-          TEXT_COLOR_2, returnedTheme.colors.textcolor,
-          "Theme 2 text color should be applied");
+          TEXT_COLOR_2, returnedTheme.colors.tab_background_text,
+          "Theme 2 tab_background_text color should be applied");
       }
 
       function testEmptyTheme(returnedTheme) {
         browser.test.assertEq(0, Object.keys(returnedTheme).length, JSON.stringify(returnedTheme, null, 2));
       }
 
       browser.test.log("Testing getCurrent() with initial unthemed window");
       const firstWin = await browser.windows.getCurrent();
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_onUpdated.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_onUpdated.js
@@ -14,56 +14,56 @@ add_task(async function test_on_updated(
       const ACCENT_COLOR_1 = "#a14040";
       const TEXT_COLOR_1 = "#fac96e";
 
       const ACCENT_COLOR_2 = "#03fe03";
       const TEXT_COLOR_2 = "#0ef325";
 
       const theme1 = {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR_1,
-          "textcolor": TEXT_COLOR_1,
+          "frame": ACCENT_COLOR_1,
+          "tab_background_text": TEXT_COLOR_1,
         },
       };
 
       const theme2 = {
         "images": {
-          "headerURL": "image2.png",
+          "theme_frame": "image2.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR_2,
-          "textcolor": TEXT_COLOR_2,
+          "frame": ACCENT_COLOR_2,
+          "tab_background_text": TEXT_COLOR_2,
         },
       };
 
       function testTheme1(returnedTheme) {
         browser.test.assertTrue(
-          returnedTheme.images.headerURL.includes("image1.png"),
-          "Theme 1 header URL should be applied");
+          returnedTheme.images.theme_frame.includes("image1.png"),
+          "Theme 1 theme_frame image should be applied");
         browser.test.assertEq(
-          ACCENT_COLOR_1, returnedTheme.colors.accentcolor,
-          "Theme 1 accent color should be applied");
+          ACCENT_COLOR_1, returnedTheme.colors.frame,
+          "Theme 1 frame color should be applied");
         browser.test.assertEq(
-          TEXT_COLOR_1, returnedTheme.colors.textcolor,
-          "Theme 1 text color should be applied");
+          TEXT_COLOR_1, returnedTheme.colors.tab_background_text,
+          "Theme 1 tab_background_text color should be applied");
       }
 
       function testTheme2(returnedTheme) {
         browser.test.assertTrue(
-          returnedTheme.images.headerURL.includes("image2.png"),
-          "Theme 2 header URL should be applied");
+          returnedTheme.images.theme_frame.includes("image2.png"),
+          "Theme 2 theme_frame image should be applied");
         browser.test.assertEq(
-          ACCENT_COLOR_2, returnedTheme.colors.accentcolor,
-          "Theme 2 accent color should be applied");
+          ACCENT_COLOR_2, returnedTheme.colors.frame,
+          "Theme 2 frame color should be applied");
         browser.test.assertEq(
-          TEXT_COLOR_2, returnedTheme.colors.textcolor,
-          "Theme 2 text color should be applied");
+          TEXT_COLOR_2, returnedTheme.colors.tab_background_text,
+          "Theme 2 tab_background_text color should be applied");
       }
 
       const firstWin = await browser.windows.getCurrent();
       const secondWin = await browser.windows.create();
 
       const onceThemeUpdated = () => new Promise(resolve => {
         const listener = updateInfo => {
           browser.theme.onUpdated.removeListener(listener);
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
@@ -60,35 +60,37 @@ add_task(async function test_dynamic_the
     },
   });
 
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
   extension.sendMessage("update-theme", {
     "images": {
-      "headerURL": "image1.png",
+      "theme_frame": "image1.png",
     },
     "colors": {
-      "accentcolor": ACCENT_COLOR_1,
-      "textcolor": TEXT_COLOR_1,
+      "frame": ACCENT_COLOR_1,
+      "tab_background_text": TEXT_COLOR_1,
     },
   });
 
   await extension.awaitMessage("theme-updated");
 
   validateTheme("image1.png", ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
+  // Check with the LWT aliases (to update on Firefox 69, because the
+  // LWT aliases are going to be removed).
   extension.sendMessage("update-theme", {
     "images": {
-      "headerURL": "image2.png",
+      "theme_frame": "image2.png",
     },
     "colors": {
-      "accentcolor": ACCENT_COLOR_2,
-      "textcolor": TEXT_COLOR_2,
+      "frame": ACCENT_COLOR_2,
+      "tab_background_text": TEXT_COLOR_2,
     },
   });
 
   await extension.awaitMessage("theme-updated");
 
   validateTheme("image2.png", ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
   extension.sendMessage("reset-theme");
@@ -124,35 +126,35 @@ add_task(async function test_dynamic_the
     },
   });
 
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
   extension.sendMessage("update-theme", {
     "images": {
-      "headerURL": BACKGROUND_1,
+      "theme_frame": BACKGROUND_1,
     },
     "colors": {
-      "accentcolor": ACCENT_COLOR_1,
-      "textcolor": TEXT_COLOR_1,
+      "frame": ACCENT_COLOR_1,
+      "tab_background_text": TEXT_COLOR_1,
     },
   });
 
   await extension.awaitMessage("theme-updated");
 
   validateTheme(BACKGROUND_1, ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
   extension.sendMessage("update-theme", {
     "images": {
-      "headerURL": BACKGROUND_2,
+      "theme_frame": BACKGROUND_2,
     },
     "colors": {
-      "accentcolor": ACCENT_COLOR_2,
-      "textcolor": TEXT_COLOR_2,
+      "frame": ACCENT_COLOR_2,
+      "tab_background_text": TEXT_COLOR_2,
     },
   });
 
   await extension.awaitMessage("theme-updated");
 
   validateTheme(BACKGROUND_2, ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
   extension.sendMessage("reset-theme");
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_findbar.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_findbar.js
@@ -5,23 +5,23 @@
 
 add_task(async function test_support_toolbar_properties_on_findbar() {
   const TOOLBAR_COLOR = "#ff00ff";
   const TOOLBAR_TEXT_COLOR = "#9400ff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar": TOOLBAR_COLOR,
-          "toolbar_text": TOOLBAR_TEXT_COLOR,
+          "bookmark_text": TOOLBAR_TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
@@ -49,21 +49,21 @@ add_task(async function test_support_too
 add_task(async function test_support_toolbar_field_properties_on_findbar() {
   const TOOLBAR_FIELD_COLOR = "#ff00ff";
   const TOOLBAR_FIELD_TEXT_COLOR = "#9400ff";
   const TOOLBAR_FIELD_BORDER_COLOR = "#ffffff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_field": TOOLBAR_FIELD_COLOR,
           "toolbar_field_text": TOOLBAR_FIELD_TEXT_COLOR,
           "toolbar_field_border": TOOLBAR_FIELD_BORDER_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_getCurrent_differentExt.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_getCurrent_differentExt.js
@@ -3,21 +3,21 @@
 // This test checks whether browser.theme.getCurrent() works correctly when theme
 // does not originate from extension querying the theme.
 
 add_task(async function test_getcurrent() {
   const theme = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
@@ -32,22 +32,22 @@ add_task(async function test_getcurrent(
   });
 
   await extension.startup();
 
   info("Testing getCurrent after static theme startup");
   let updatedPromise = extension.awaitMessage("theme-updated");
   await theme.startup();
   let receivedTheme = await updatedPromise;
-  Assert.ok(receivedTheme.images.headerURL.includes("image1.png"),
-            "getCurrent returns correct headerURL");
-  Assert.equal(receivedTheme.colors.accentcolor, ACCENT_COLOR,
-               "getCurrent returns correct accentcolor");
-  Assert.equal(receivedTheme.colors.textcolor, TEXT_COLOR,
-               "getCurrent returns correct textcolor");
+  Assert.ok(receivedTheme.images.theme_frame.includes("image1.png"),
+            "getCurrent returns correct theme_frame image");
+  Assert.equal(receivedTheme.colors.frame, ACCENT_COLOR,
+               "getCurrent returns correct frame color");
+  Assert.equal(receivedTheme.colors.tab_background_text, TEXT_COLOR,
+               "getCurrent returns correct tab_background_text color");
 
   info("Testing getCurrent after static theme unload");
   updatedPromise = extension.awaitMessage("theme-updated");
   await theme.unload();
   receivedTheme = await updatedPromise;
   Assert.equal(Object.keys(receivedTheme), 0,
                "getCurrent returns empty theme");
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_multiple_backgrounds.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_multiple_backgrounds.js
@@ -1,21 +1,21 @@
 "use strict";
 
 add_task(async function test_support_backgrounds_position() {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "face1.png",
+          "theme_frame": "face1.png",
           "additional_backgrounds": ["face2.png", "face2.png", "face2.png"],
         },
         "colors": {
-          "accentcolor": `rgb(${FRAME_COLOR.join(",")})`,
-          "textcolor": `rgb(${TAB_BACKGROUND_TEXT_COLOR.join(",")})`,
+          "frame": `rgb(${FRAME_COLOR.join(",")})`,
+          "tab_background_text": `rgb(${TAB_BACKGROUND_TEXT_COLOR.join(",")})`,
         },
         "properties": {
           "additional_backgrounds_alignment": ["left top", "center top", "right bottom"],
         },
       },
     },
     files: {
       "face1.png": imageBufferFromDataURI(ENCODED_IMAGE_DATA),
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
@@ -82,26 +82,26 @@ add_task(async function test_support_ntp
     SpecialPowers.clearUserPref("browser.newtab.preload");
   });
   gBrowser.removePreloadedBrowser();
   for (let url of ["about:newtab", "about:home", "about:welcome"]) {
     info("Opening url: " + url);
     await BrowserTestUtils.withNewTab({gBrowser, url}, async browser => {
       await test_ntp_theme({
         colors: {
-          accentcolor: ACCENT_COLOR,
-          textcolor: TEXT_COLOR,
+          frame: ACCENT_COLOR,
+          tab_background_text: TEXT_COLOR,
           ntp_background: "#add8e6",
           ntp_text: "#00008b",
         },
       }, false, url);
 
       await test_ntp_theme({
         colors: {
-          accentcolor: ACCENT_COLOR,
-          textcolor: TEXT_COLOR,
+          frame: ACCENT_COLOR,
+          tab_background_text: TEXT_COLOR,
           ntp_background: "#00008b",
           ntp_text: "#add8e6",
         },
       }, true, url);
     });
   }
 });
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
@@ -98,27 +98,27 @@ add_task(async function test_per_window_
       async function checkWindow(theme, isBrightText, winId) {
         let windowChecked = promiseWindowChecked();
         browser.test.sendMessage("check-window", {theme, isBrightText, winId});
         await windowChecked;
       }
 
       const darkTextTheme = {
         colors: {
-          accentcolor: "#add8e6",
-          textcolor: "#000",
+          frame: "#add8e6",
+          tab_background_text: "#000",
           ntp_background: "#add8e6",
           ntp_text: "#000",
         },
       };
 
       const brightTextTheme = {
         colors: {
-          accentcolor: "#00008b",
-          textcolor: "#add8e6",
+          frame: "#00008b",
+          tab_background_text: "#add8e6",
           ntp_background: "#00008b",
           ntp_text: "#add8e6",
         },
       };
 
       let {id: winId} = await browser.windows.getCurrent();
       let {id: secondWinId} = await createWindow();
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js
@@ -3,21 +3,21 @@
 // This test checks whether applied WebExtension themes are persisted and applied
 // on newly opened windows.
 
 add_task(async function test_multiple_windows() {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
@@ -3,19 +3,19 @@
 // This test checks color sanitization in various situations
 
 add_task(async function test_sanitization_invalid() {
   // This test checks that invalid values are sanitized
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
-          "toolbar_text": "ntimsfavoriteblue",
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
+          "bookmark_text": "ntimsfavoriteblue",
         },
       },
     },
   });
 
   await extension.startup();
 
   let navbar = document.querySelector("#nav-bar");
@@ -29,19 +29,19 @@ add_task(async function test_sanitizatio
 });
 
 add_task(async function test_sanitization_css_variables() {
   // This test checks that CSS variables are sanitized
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
-          "toolbar_text": "var(--arrowpanel-dimmed)",
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
+          "bookmark_text": "var(--arrowpanel-dimmed)",
         },
       },
     },
   });
 
   await extension.startup();
 
   let navbar = document.querySelector("#nav-bar");
@@ -55,18 +55,18 @@ add_task(async function test_sanitizatio
 });
 
 add_task(async function test_sanitization_transparent() {
   // This test checks whether transparent values are applied properly
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_top_separator": "transparent",
         },
       },
     },
   });
 
   await extension.startup();
 
@@ -74,24 +74,24 @@ add_task(async function test_sanitizatio
   Assert.ok(
     window.getComputedStyle(navbar).boxShadow.includes("rgba(0, 0, 0, 0)"),
     "Top separator should be transparent"
   );
 
   await extension.unload();
 });
 
-add_task(async function test_sanitization_transparent_accentcolor() {
-  // This test checks whether transparent accentcolor falls back to white.
+add_task(async function test_sanitization_transparent_frame_color() {
+  // This test checks whether transparent frame color falls back to white.
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": "transparent",
-          "textcolor": TEXT_COLOR,
+          "frame": "transparent",
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
   });
 
   await extension.startup();
 
   let docEl = document.documentElement;
@@ -99,24 +99,24 @@ add_task(async function test_sanitizatio
     window.getComputedStyle(docEl).backgroundColor,
     "rgb(255, 255, 255)",
     "Accent color should be white",
   );
 
   await extension.unload();
 });
 
-add_task(async function test_sanitization_transparent_textcolor() {
+add_task(async function test_sanitization_transparent_tab_background_text_color() {
   // This test checks whether transparent textcolor falls back to black.
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": "transparent",
+          "frame": ACCENT_COLOR,
+          "tab_background_text": "transparent",
         },
       },
     },
   });
 
   await extension.startup();
 
   let docEl = document.documentElement;
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_separators.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_separators.js
@@ -8,21 +8,21 @@ add_task(async function test_support_sep
   const SEPARATOR_VERTICAL_COLOR = "#f0000f";
   const SEPARATOR_FIELD_COLOR = "#9400ff";
   const SEPARATOR_BOTTOM_COLOR = "#3366cc";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_top_separator": SEPARATOR_TOP_COLOR,
           "toolbar_vertical_separator": SEPARATOR_VERTICAL_COLOR,
           "toolbar_field_separator": SEPARATOR_FIELD_COLOR,
           "toolbar_bottom_separator": SEPARATOR_BOTTOM_COLOR,
         },
       },
     },
     files: {
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_static_onUpdated.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_static_onUpdated.js
@@ -3,21 +3,21 @@
 // This test checks whether browser.theme.onUpdated works
 // when a static theme is applied
 
 add_task(async function test_on_updated() {
   const theme = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
@@ -31,22 +31,22 @@ add_task(async function test_on_updated(
 
   await extension.startup();
 
   info("Testing update event on static theme startup");
   let updatedPromise = extension.awaitMessage("theme-updated");
   await theme.startup();
   const {theme: receivedTheme, windowId} = await updatedPromise;
   Assert.ok(!windowId, "No window id in static theme update event");
-  Assert.ok(receivedTheme.images.headerURL.includes("image1.png"),
-            "Theme header URL should be applied");
-  Assert.equal(receivedTheme.colors.accentcolor, ACCENT_COLOR,
-               "Theme accent color should be applied");
-  Assert.equal(receivedTheme.colors.textcolor, TEXT_COLOR,
-               "Theme text color should be applied");
+  Assert.ok(receivedTheme.images.theme_frame.includes("image1.png"),
+            "Theme theme_frame image should be applied");
+  Assert.equal(receivedTheme.colors.frame, ACCENT_COLOR,
+               "Theme frame color should be applied");
+  Assert.equal(receivedTheme.colors.tab_background_text, TEXT_COLOR,
+               "Theme tab_background_text color should be applied");
 
   info("Testing update event on static theme unload");
   updatedPromise = extension.awaitMessage("theme-updated");
   await theme.unload();
   const updateInfo = await updatedPromise;
   Assert.ok(!windowId, "No window id in static theme update event on unload");
   Assert.equal(Object.keys(updateInfo.theme), 0,
                "unloading theme sends empty theme in update event");
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_tab_line.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_tab_line.js
@@ -4,18 +4,18 @@
 // the color of the tab line are applied properly.
 
 add_task(async function test_support_tab_line() {
   const TAB_LINE_COLOR = "#9400ff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "tab_line": TAB_LINE_COLOR,
         },
       },
     },
   });
 
   await extension.startup();
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_tab_loading.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_tab_loading.js
@@ -3,22 +3,22 @@
 add_task(async function test_support_tab_loading_filling() {
   const TAB_LOADING_COLOR = "#FF0000";
   const TAB_TEXT_COLOR = "#9400ff";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": "#000",
+          "frame": "#000",
           "toolbar": "#124455",
-          "textcolor": TAB_TEXT_COLOR,
+          "tab_background_text": TAB_TEXT_COLOR,
           "tab_loading":  TAB_LOADING_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_tab_selected.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_tab_selected.js
@@ -4,18 +4,18 @@
 // the background color of selected tab are applied correctly.
 
 add_task(async function test_tab_background_color_property() {
   const TAB_BACKGROUND_COLOR = "#9400ff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "tab_selected": TAB_BACKGROUND_COLOR,
         },
       },
     },
   });
 
   await extension.startup();
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_tab_separators.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_tab_separators.js
@@ -2,18 +2,18 @@
 
 add_task(async function test_support_tab_separators() {
   const TAB_SEPARATOR_COLOR = "#FF0000";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": "#000",
-          "textcolor": "#9400ff",
+          "frame": "#000",
+          "tab_background_text": "#9400ff",
           "tab_background_separator":  TAB_SEPARATOR_COLOR,
         },
       },
     },
   });
   await extension.startup();
 
   info("Checking background tab separator color");
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_tab_text.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_tab_text.js
@@ -4,21 +4,21 @@
 // the text color of the selected tab are applied properly.
 
 add_task(async function test_support_tab_text_property_css_color() {
   const TAB_TEXT_COLOR = "#9400ff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "tab_text": TAB_TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
@@ -35,21 +35,21 @@ add_task(async function test_support_tab
 });
 
 add_task(async function test_support_tab_text_chrome_array() {
   const TAB_TEXT_COLOR = [148, 0, 255];
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": FRAME_COLOR,
-          "textcolor": TAB_BACKGROUND_TEXT_COLOR,
+          "frame": FRAME_COLOR,
+          "tab_background_text": TAB_BACKGROUND_TEXT_COLOR,
           "tab_text": TAB_TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
@@ -7,19 +7,19 @@ add_task(async function test_theme_trans
   const TOOLBAR = "#f27489";
   const TEXT_COLOR = "#000000";
   const TRANSITION_PROPERTY = "background-color";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "textcolor": TEXT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar": TOOLBAR,
-          "toolbar_text": TEXT_COLOR,
+          "bookmark_text": TEXT_COLOR,
         },
       },
     },
   });
 
   await extension.startup();
 
   // check transition effect for toolbars
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields.js
@@ -18,21 +18,21 @@ add_task(async function test_support_too
 
   const TOOLBAR_FIELD_BACKGROUND = "#ff00ff";
   const TOOLBAR_FIELD_COLOR = "#00ff00";
   const TOOLBAR_FIELD_BORDER = "#aaaaff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_field": TOOLBAR_FIELD_BACKGROUND,
           "toolbar_field_text": TOOLBAR_FIELD_COLOR,
           "toolbar_field_border": TOOLBAR_FIELD_BORDER,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
@@ -83,18 +83,18 @@ add_task(async function test_support_too
   });
   let toolbox = document.querySelector("#navigator-toolbox");
   let urlbar = toolbox.querySelector("#urlbar");
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_field": "#fff",
           "toolbar_field_text": "#000",
         },
       },
     },
   });
 
   await extension.startup();
@@ -105,18 +105,18 @@ add_task(async function test_support_too
             "Brighttext attribute should not be set");
 
   await extension.unload();
 
   extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar_field": "#000",
           "toolbar_field_text": "#fff",
         },
       },
     },
   });
 
   await extension.startup();
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields_focus.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields_focus.js
@@ -6,18 +6,18 @@ add_task(async function test_toolbar_fie
   const TOOLBAR_FOCUS_BACKGROUND = "#FF0000";
   const TOOLBAR_FOCUS_TEXT = "#9400FF";
   const TOOLBAR_FOCUS_BORDER = "#FFFFFF";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": "#FF0000",
-          "textcolor": "#ffffff",
+          "frame": "#FF0000",
+          "tab_background_color": "#ffffff",
           "toolbar_field": TOOLBAR_FIELD_BACKGROUND,
           "toolbar_field_text": TOOLBAR_FIELD_COLOR,
           "toolbar_field_focus": TOOLBAR_FOCUS_BACKGROUND,
           "toolbar_field_text_focus": TOOLBAR_FOCUS_TEXT,
           "toolbar_field_border_focus": TOOLBAR_FOCUS_BORDER,
         },
       },
     },
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_colors.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_colors.js
@@ -8,21 +8,21 @@
 add_task(async function test_button_background_properties() {
   const BUTTON_BACKGROUND_ACTIVE = "#FFFFFF";
   const BUTTON_BACKGROUND_HOVER = "#59CBE8";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "button_background_active": BUTTON_BACKGROUND_ACTIVE,
           "button_background_hover": BUTTON_BACKGROUND_HOVER,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_icons.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_toolbarbutton_icons.js
@@ -6,21 +6,21 @@
 add_task(async function test_icons_properties() {
   const ICONS_COLOR = "#001b47";
   const ICONS_ATTENTION_COLOR = "#44ba77";
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "icons": ICONS_COLOR,
           "icons_attention": ICONS_ATTENTION_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
@@ -55,21 +55,21 @@ add_task(async function test_icons_prope
   await extension.unload();
 });
 
 add_task(async function test_no_icons_properties() {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "images": {
-          "headerURL": "image1.png",
+          "theme_frame": "image1.png",
         },
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
         },
       },
     },
     files: {
       "image1.png": BACKGROUND,
     },
   });
 
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_toolbars.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_toolbars.js
@@ -5,19 +5,21 @@
 
 add_task(async function test_support_toolbar_property() {
   const TOOLBAR_COLOR = "#ff00ff";
   const TOOLBAR_TEXT_COLOR = "#9400ff";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
-          "textcolor": TEXT_COLOR,
+          "frame": ACCENT_COLOR,
+          "tab_background_text": TEXT_COLOR,
           "toolbar": TOOLBAR_COLOR,
+          // NOTE: this property is going to be removed on Firefox 69
+          // (and bookmark_text is going to replace it).
           "toolbar_text": TOOLBAR_TEXT_COLOR,
         },
       },
     },
   });
 
   let toolbox = document.querySelector("#navigator-toolbox");
   let toolbars = [...toolbox.querySelectorAll("toolbar:not(#TabsToolbar)")].filter(toolbar => {