[inspector] align console.time(undefined) and console.time() with spec

R=dgozman@chromium.org

Bug: chromium:696798
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ida60ee5fb3e3e42d15bf6d4bad84dfcfb521b74f
Reviewed-on: https://chromium-review.googlesource.com/722073Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48617}

src/inspector/v8-console.cc

@@ -109,8 +109,11 @@ class ConsoleHelper {
     return m_info[0]->BooleanValue(m_context).FromMaybe(defaultValue);
   }
 
-  String16 firstArgToString(const String16& defaultValue) {
-    if (m_info.Length() < 1) return defaultValue;
+  String16 firstArgToString(const String16& defaultValue,
+                            bool allowUndefined = true) {
+    if (m_info.Length() < 1 || (!allowUndefined && m_info[0]->IsUndefined())) {
+      return defaultValue;
+    }
     v8::Local<v8::String> titleValue;
     v8::TryCatch tryCatch(m_context->GetIsolate());
     if (m_info[0]->IsObject()) {
@@ -349,7 +352,7 @@ static void timeFunction(const v8::debug::ConsoleCallArguments& info,
                          const v8::debug::ConsoleContext& consoleContext,
                          bool timelinePrefix, V8InspectorImpl* inspector) {
   ConsoleHelper helper(info, consoleContext, inspector);
-  String16 protocolTitle = helper.firstArgToString("default");
+  String16 protocolTitle = helper.firstArgToString("default", false);
   if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
   inspector->client()->consoleTime(toStringView(protocolTitle));
   helper.consoleMessageStorage()->time(
@@ -361,7 +364,7 @@ static void timeEndFunction(const v8::debug::ConsoleCallArguments& info,
                             const v8::debug::ConsoleContext& consoleContext,
                             bool timelinePrefix, V8InspectorImpl* inspector) {
   ConsoleHelper helper(info, consoleContext, inspector);
-  String16 protocolTitle = helper.firstArgToString("default");
+  String16 protocolTitle = helper.firstArgToString("default", false);
   if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
   inspector->client()->consoleTimeEnd(toStringView(protocolTitle));
   double elapsed = helper.consoleMessageStorage()->timeEnd(

test/inspector/runtime/console-time-end-format-expected.txt

@@ -27,3 +27,11 @@ timeEnd: 1000000000000000.2ms
 Running test: huge
 js: 1e+42ms
 timeEnd: 1e+42ms
+
+Running test: undefinedAsLabel
+js: 1ms
+default: 1ms
+
+Running test: emptyAsLabel
+js: 1ms
+default: 1ms

test/inspector/runtime/console-time-end-format.js

@@ -9,37 +9,43 @@ Protocol.Runtime.onConsoleAPICalled(message => {
   InspectorTest.log(message.params.args[0].value);
 });
 
-InspectorTest.runTestSuite([
-  function zero(next) {
-    checkInterval(0.0).then(next);
+InspectorTest.runAsyncTestSuite([
+  function zero() {
+    return checkInterval(0.0);
   },
-  function verySmall(next) {
-    checkInterval(1e-15).then(next);
+  function verySmall() {
+    return checkInterval(1e-15);
   },
-  function small(next) {
-    checkInterval(0.001).then(next);
+  function small() {
+    return checkInterval(0.001);
   },
-  function regular(next) {
-    checkInterval(1.2345).then(next);
+  function regular() {
+    return checkInterval(1.2345);
   },
-  function big(next) {
-    checkInterval(10000.2345).then(next);
+  function big() {
+    return checkInterval(10000.2345);
   },
-  function veryBig(next) {
-    checkInterval(1e+15 + 0.2345).then(next);
+  function veryBig() {
+    return checkInterval(1e+15 + 0.2345);
   },
-  function huge(next) {
-    checkInterval(1e+42).then(next);
+  function huge() {
+    return checkInterval(1e+42);
+  },
+  function undefinedAsLabel() {
+    return checkInterval(1.0, 'undefined');
+  },
+  function emptyAsLabel() {
+    return checkInterval(1.0, '');
   }
 ]);
 
-function checkInterval(time) {
+async function checkInterval(time, label) {
+  label = label === undefined ? '\'timeEnd\'' : label;
   utils.setCurrentTimeMSForTest(0.0);
-  return Protocol.Runtime.evaluate({
-    expression: `console.log('js: ' + ${time} + 'ms')`})
-    .then(() => Protocol.Runtime.evaluate({
-      expression: 'console.time(\'timeEnd\')'}))
-    .then(() => utils.setCurrentTimeMSForTest(time))
-    .then(() => Protocol.Runtime.evaluate({
-      expression: 'console.timeEnd(\'timeEnd\')'}));
+  Protocol.Runtime.evaluate({
+    expression: `console.log('js: ' + ${time} + 'ms')`
+  });
+  await Protocol.Runtime.evaluate({expression: `console.time(${label})`});
+  utils.setCurrentTimeMSForTest(time);
+  await Protocol.Runtime.evaluate({expression: `console.timeEnd(${label})`});
 }