1 files changed, 21 insertions, 7 deletions
diff --git a/deps/v8/test/inspector/cpu-profiler/record-cpu-profile.js b/deps/v8/test/inspector/cpu-profiler/record-cpu-profile.js
index c87d600124..3799cf74f5 100644
--- a/deps/v8/test/inspector/cpu-profiler/record-cpu-profile.js
+++ b/deps/v8/test/inspector/cpu-profiler/record-cpu-profile.js
@@ -2,47 +2,61 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-InspectorTest.log("Test that profiler is able to record a profile. Also it tests that profiler returns an error when it unable to find the profile.");
+let {session, contextGroup, Protocol} = InspectorTest.start("Test that profiler is able to record a profile. Also it tests that profiler returns an error when it unable to find the profile.");
 
 Protocol.Profiler.enable();
 Protocol.Profiler.start().then(didStartFrontendProfile);
 function didStartFrontendProfile(messageObject)
 {
-  if (!InspectorTest.expectedSuccess("startFrontendProfile", messageObject))
+  if (!expectedSuccess("startFrontendProfile", messageObject))
     return;
   Protocol.Runtime.evaluate({expression: "console.profile('Profile 1');"}).then(didStartConsoleProfile);
 }
 
 function didStartConsoleProfile(messageObject)
 {
-  if (!InspectorTest.expectedSuccess("startConsoleProfile", messageObject))
+  if (!expectedSuccess("startConsoleProfile", messageObject))
     return;
   Protocol.Runtime.evaluate({expression: "console.profileEnd('Profile 1');"}).then(didStopConsoleProfile);
 }
 
 function didStopConsoleProfile(messageObject)
 {
-  if (!InspectorTest.expectedSuccess("stopConsoleProfile", messageObject))
+  if (!expectedSuccess("stopConsoleProfile", messageObject))
     return;
   Protocol.Profiler.stop().then(didStopFrontendProfile);
 }
 
 function didStopFrontendProfile(messageObject)
 {
-  if (!InspectorTest.expectedSuccess("stoppedFrontendProfile", messageObject))
+  if (!expectedSuccess("stoppedFrontendProfile", messageObject))
     return;
   Protocol.Profiler.start().then(didStartFrontendProfile2);
 }
 
 function didStartFrontendProfile2(messageObject)
 {
-  if (!InspectorTest.expectedSuccess("startFrontendProfileSecondTime", messageObject))
+  if (!expectedSuccess("startFrontendProfileSecondTime", messageObject))
     return;
   Protocol.Profiler.stop().then(didStopFrontendProfile2);
 }
 
 function didStopFrontendProfile2(messageObject)
 {
-  InspectorTest.expectedSuccess("stopFrontendProfileSecondTime", messageObject)
+  expectedSuccess("stopFrontendProfileSecondTime", messageObject)
   InspectorTest.completeTest();
 }
+
+function checkExpectation(fail, name, messageObject)
+{
+  if (fail === !!messageObject.error) {
+    InspectorTest.log("PASS: " + name);
+    return true;
+  }
+
+  InspectorTest.log("FAIL: " + name + ": " + JSON.stringify(messageObject));
+  InspectorTest.completeTest();
+  return false;
+}
+var expectedSuccess = checkExpectation.bind(null, false);
+var expectedError = checkExpectation.bind(null, true);