gistfile1.txt

diff --git a/devtools/client/aboutdebugging-new/src/components/RuntimePage.js b/devtools/client/aboutdebugging-new/src/components/RuntimePage.js
--- a/devtools/client/aboutdebugging-new/src/components/RuntimePage.js
+++ b/devtools/client/aboutdebugging-new/src/components/RuntimePage.js
@@ -126,17 +126,19 @@ class RuntimePage extends PureComponent 
       );
     });
 
     return Message(
       {
         level: MESSAGE_LEVEL.ERROR,
       },
       dom.div(
-        {},
+        {
+          className: "js-extension-install-error",
+        },
         Localized(
           {
             id: "about-debugging-tmp-extension-install-error",
           },
           dom.span({}, "There was an error during the temporary add-on installation")
         ),
         errors
       )
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
@@ -38,25 +38,30 @@ class Sidebar extends PureComponent {
       usbRuntimes: PropTypes.arrayOf(Types.runtime).isRequired,
     };
   }
 
   renderAdbAddonStatus() {
     const isAddonInstalled = this.props.adbAddonStatus === ADB_ADDON_STATES.INSTALLED;
     const localizationId = isAddonInstalled ? "about-debugging-sidebar-usb-enabled" :
                                               "about-debugging-sidebar-usb-disabled";
-    return Localized(
+    return Message(
       {
-        id: localizationId,
+        level: MESSAGE_LEVEL.INFO,
       },
-      Message(
+      Localized(
         {
-          level: MESSAGE_LEVEL.INFO,
+          id: localizationId,
         },
-        localizationId
+        dom.aside(
+          {
+            className: "js-sidebar-usb-status",
+          },
+          localizationId
+        ),
       )
     );
   }
 
   renderDevicesEmpty() {
     return SidebarItem(
       {
         isSelected: false,
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_manifest_url.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_manifest_url.js
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_manifest_url.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_manifest_url.js
@@ -18,17 +18,17 @@ add_task(async function() {
   await checkAdbNotRunning();
 
   const { document, tab, window } = await openAboutDebugging();
   await selectThisFirefoxPage(document, window.AboutDebugging.store);
   const usbStatusElement = document.querySelector(".js-sidebar-usb-status");
 
   info("Install ADB");
   adbAddon.install("internal");
-  await waitUntil(() => usbStatusElement.textContent.includes("USB devices enabled"));
+  await waitUntil(() => usbStatusElement.textContent.includes("USB enabled"));
   await waitForAdbStart();
 
   info("Wait until the debug target for ADB appears");
   await waitUntil(() => findDebugTargetByText(ABD_ADDON_NAME, document));
   const adbExtensionItem = findDebugTargetByText(ABD_ADDON_NAME, document);
 
   const manifestUrlElement = adbExtensionItem.querySelector(".js-manifest-url");
   ok(manifestUrlElement, "A link to the manifest is displayed");
@@ -48,14 +48,14 @@ add_task(async function() {
   ok(manifestObject, "The displayed content is a valid JSON object");
   is(manifestObject.name, ABD_ADDON_NAME, "Manifest tab shows the expected content");
 
   info("Close the manifest.json tab");
   await removeTab(target);
 
   info("Uninstall the adb extension and wait for the message to udpate");
   adbAddon.uninstall();
-  await waitUntil(() => usbStatusElement.textContent.includes("USB devices disabled"));
+  await waitUntil(() => usbStatusElement.textContent.includes("USB disabled"));
   await waitForAdbStop();
 
   await waitForRequestsToSettle(window.AboutDebugging.store);
   await removeTab(tab);
 });
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_temporary_install_error.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_temporary_install_error.js
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_temporary_install_error.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_addons_temporary_install_error.js
@@ -26,17 +26,17 @@ add_task(async function testInvalidJsonE
   const installError = await installBadExtension(INVALID_JSON_EXTENSION_PATH, document);
   ok(installError.textContent.includes("JSON.parse: unexpected keyword"),
     "The expected installation error is displayed: " + installError.textContent);
 
   info("Install a valid extension to make the message disappear");
   await installTemporaryExtension(EXTENSION_PATH, EXTENSION_NAME, document);
 
   info("Wait until the error message disappears");
-  await waitUntil(() => !document.querySelector(".js-message"));
+  await waitUntil(() => !document.querySelector(".js-extension-install-error"));
 
   info("Wait for the temporary addon to be displayed as a debug target");
   await waitUntil(() => findDebugTargetByText(EXTENSION_NAME, document));
 
   await removeTemporaryExtension(EXTENSION_NAME, document);
 
   await removeTab(tab);
 });
@@ -60,11 +60,11 @@ add_task(async function testInvalidPrope
 
 async function installBadExtension(path, document) {
   info("Install a bad extension at path: " + path);
   // Do not use installTemporaryAddon here since the install will fail.
   prepareMockFilePicker(path);
   document.querySelector(".js-temporary-extension-install-button").click();
 
   info("Wait until the install error message appears");
-  await waitUntil(() => document.querySelector(".js-message"));
-  return document.querySelector(".js-message");
+  await waitUntil(() => document.querySelector(".js-extension-install-error"));
+  return document.querySelector(".js-extension-install-error");
 }
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_connect_toggle_usb_devices.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_connect_toggle_usb_devices.js
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_connect_toggle_usb_devices.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_connect_toggle_usb_devices.js
@@ -41,17 +41,17 @@ add_task(async function() {
     "The message about enabling USB devices is no longer rendered");
 
   info("Check that the addon was installed with the proper source");
   const adbExtensionId = Services.prefs.getCharPref("devtools.remote.adb.extensionID");
   const addon = await AddonManager.getAddonByID(adbExtensionId);
   Assert.deepEqual(addon.installTelemetryInfo, { source: "about:debugging" },
     "Got the expected addon.installTelemetryInfo");
 
-  // Right now we are resuming as soon as "USB devices enabled" is displayed, but ADB
+  // Right now we are resuming as soon as "USB enabled" is displayed, but ADB
   // might still be starting up. If we move to uninstall directly, the ADB startup will
   // fail and we will have an unhandled promise rejection.
   // See Bug 1498469.
   await waitForAdbStart();
 
   info("Click on the toggle button");
   usbToggleButton.click();
 
diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_usb_status.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_usb_status.js
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_usb_status.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_sidebar_usb_status.js
@@ -16,28 +16,28 @@ add_task(async function() {
   await pushPref("devtools.remote.adb.extensionURL",
                  CHROME_URL_ROOT + "resources/test-adb-extension/adb-extension-#OS#.xpi");
   await checkAdbNotRunning();
 
   const { document, tab } = await openAboutDebugging();
 
   const usbStatusElement = document.querySelector(".js-sidebar-usb-status");
   ok(usbStatusElement, "Sidebar shows the USB status element");
-  ok(usbStatusElement.textContent.includes("USB devices disabled"),
+  ok(usbStatusElement.textContent.includes("USB disabled"),
     "USB status element has the expected content");
 
   info("Install the adb extension and wait for the message to udpate");
   // Use "internal" as the install source to avoid triggering telemetry.
   adbAddon.install("internal");
-  await waitUntil(() => usbStatusElement.textContent.includes("USB devices enabled"));
-  // Right now we are resuming as soon as "USB devices enabled" is displayed, but ADB
+  await waitUntil(() => usbStatusElement.textContent.includes("USB enabled"));
+  // Right now we are resuming as soon as "USB enabled" is displayed, but ADB
   // might still be starting up. If we move to uninstall directly, the ADB startup will
   // fail and we will have an unhandled promise rejection.
   // See Bug 1498469.
   await waitForAdbStart();
 
   info("Uninstall the adb extension and wait for the message to udpate");
   adbAddon.uninstall();
-  await waitUntil(() => usbStatusElement.textContent.includes("USB devices disabled"));
+  await waitUntil(() => usbStatusElement.textContent.includes("USB disabled"));
   await waitForAdbStop();
 
   await removeTab(tab);
 });
diff --git a/devtools/client/aboutdebugging-new/test/browser/helper-real-usb.js b/devtools/client/aboutdebugging-new/test/browser/helper-real-usb.js
--- a/devtools/client/aboutdebugging-new/test/browser/helper-real-usb.js
+++ b/devtools/client/aboutdebugging-new/test/browser/helper-real-usb.js
@@ -33,17 +33,17 @@ async function openAboutDebuggingWithADB
 
   await pushPref("devtools.remote.adb.extensionURL",
                  CHROME_URL_ROOT + "resources/test-adb-extension/adb-extension-#OS#.xpi");
   await checkAdbNotRunning();
 
   const { adbAddon } = require("devtools/shared/adb/adb-addon");
   adbAddon.install("internal");
   const usbStatusElement = document.querySelector(".js-sidebar-usb-status");
-  await waitUntil(() => usbStatusElement.textContent.includes("USB devices enabled"));
+  await waitUntil(() => usbStatusElement.textContent.includes("USB enabled"));
   await waitForAdbStart();
 
   return { document, tab, window };
 }
 /* exported openAboutDebuggingWithADB */
 
 function _getExpectedRuntimesPath() {
   const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);