Backed out changeset 0d9daf8104d7 (bug 1463347) for devtools failures at webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js

devtools/client/locales/en-US/webconsole.properties

@@ -40,10 +40,10 @@ stacktrace.asyncStack=(Async: %S)
 # is the number of milliseconds.
 timeLog=%1$S: %2$Sms
 
-# LOCALIZATION NOTE (console.timeEnd): this string is used to display the result of
+# LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
-console.timeEnd=%1$S: %2$Sms - timer ended
+timeEnd=%1$S: %2$Sms
 
 # LOCALIZATION NOTE (consoleCleared): this string is displayed when receiving a
 # call to console.clear() to let the user know the previous messages of the

devtools/client/webconsole/test/fixtures/stubs/consoleApi.js

@@ -1113,9 +1113,9 @@ stubPreparedMessages.set(`console.timeEnd('bar')`, new ConsoleMessage({
   "type": "timeEnd",
   "helperType": null,
   "level": "log",
-  "messageText": "bar: 1.21ms - timer ended",
+  "messageText": "bar: 1.21ms",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms - timer ended\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}",
   "stacktrace": null,
   "frame": {
     "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",

devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js

@@ -26,8 +26,8 @@ add_task(async function() {
   const hud1 = await openNewTabAndConsole(TEST_URI);
 
   const aTimerCompleted = await waitFor(() => findMessage(hud1, "aTimer: "));
-  ok(aTimerCompleted.textContent.includes("- timer ended"), "Calling "
-    + "console.time('a') and console.timeEnd('a')ends the 'a' timer");
+  ok(aTimerCompleted, "Calling console.time('a') and console.timeEnd('a')"
+    + "ends the 'a' timer");
 
   // Calling console.time('bTimer') in the current tab, opening a new tab
   // and calling console.timeEnd('bTimer') in the new tab should not result in

devtools/client/webconsole/utils/messages.js

@@ -125,7 +125,7 @@ function transformConsoleAPICallPacket(packet) {
         // if corresponding console.time() was called before.
         const duration = Math.round(timer.duration * 100) / 100;
         if (type === "timeEnd") {
-          messageText = l10n.getFormatStr("console.timeEnd", [timer.name, duration]);
+          messageText = l10n.getFormatStr("timeEnd", [timer.name, duration]);
           parameters = null;
         } else if (type === "timeLog") {
           const [, ...rest] = parameters;