Revert of DevTools: add input event instrumentation test (patchset #2 …

…id:40001 of https://codereview.chromium.org/1704723002/ ) Reason for revert: Seems to break DevToolsPixelOutputTests.TestLatencyInfoInstrumentation on Mac. See https://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests/builds/12163 for details. Original issue's description: > DevTools: add input event instrumentation test > > BUG=554215 > > Committed: https://crrev.com/e99c42679051cd91ef92155bb7f190a9405acedc > Cr-Commit-Position: refs/heads/master@{#375802} [email protected],[email protected],[email protected] # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=554215 Review URL: https://codereview.chromium.org/1705533003 Cr-Commit-Position: refs/heads/master@{#375847}
binaryage · Feb 17, 2016 · 86fc13c · 86fc13c
1 parent 317b69e
commit 86fc13c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 73 deletions.
diff --git a/front_end/common/TestBase.js b/front_end/common/TestBase.js
@@ -79,7 +79,6 @@ WebInspector.TestBase.prototype.releaseControl = function()
         clearTimeout(this.timerId_);
         this.timerId_ = -1;
     }
-    this.controlTaken_ = false;
     this.reportOk_();
 };
 
@@ -108,7 +107,7 @@ WebInspector.TestBase.prototype.reportFailure_ = function(error)
 
 /**
  * Run specified test on a fresh instance of the test suite.
- * @param {Array<string>} args method name followed by its parameters.
+ * @param {string} name Name of a test method from implementation class.
  */
 WebInspector.TestBase.prototype.dispatch = function(args)
 {
@@ -123,19 +122,6 @@ WebInspector.TestBase.prototype.dispatch = function(args)
 };
 
 
-/**
- * Wrap an async method with TestBase.{takeControl(), releaseControl()}
- * and invoke TestBase.reportOk_ upon completion.
- * @param {Array<string>} args method name followed by its parameters.
- */
-WebInspector.TestBase.prototype.waitForAsync = function(var_args)
-{
-    var args = Array.prototype.slice.call(arguments);
-    this.takeControl();
-    args.push(this.releaseControl.bind(this));
-    this.dispatch(args);
-};
-
 /**
  * Overrides the method with specified name until it's called first time.
  * @param {!Object} receiver An object whose method to override.

diff --git a/front_end/main/Tests.js b/front_end/main/Tests.js
@@ -47,7 +47,6 @@ function createTestSuite(domAutomationController)
 function TestSuite()
 {
     WebInspector.TestBase.call(this, domAutomationController);
-    this._asyncInvocationId = 0;
 };
 
 TestSuite.prototype = {
@@ -652,87 +651,43 @@ TestSuite.prototype.waitForTestResultsInConsole = function()
     this.takeControl();
 };
 
-TestSuite.prototype.startTimeline = function(callback)
+TestSuite.prototype.invokeAsyncWithTimeline_ = function(functionName, callback)
 {
-    this.showPanel("timeline").then(function() {
+    var test = this;
+    test.showPanel("timeline").then(function() {
         WebInspector.panels.timeline._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted);
         WebInspector.panels.timeline._toggleRecording();
     });
 
     function onRecordingStarted()
     {
         WebInspector.panels.timeline._model.removeEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted);
-        callback();
-    }
-}
-
-TestSuite.prototype.stopTimeline = function(callback)
-{
-    WebInspector.panels.timeline._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onRecordingStopped);
-    WebInspector.panels.timeline._toggleRecording();
-    function onRecordingStopped()
-    {
-        WebInspector.panels.timeline._model.removeEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onRecordingStopped);
-        callback();
+        test.evaluateInConsole_(functionName + "(function() { console.log('DONE'); });", function() {});
+        WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage);
     }
-}
-
-TestSuite.prototype.invokePageFunctionAsync = function(functionName, opt_args, callback_is_always_last)
-{
-    var callback = arguments[arguments.length - 1];
-    var doneMessage = `DONE: ${functionName}.${++this._asyncInvocationId}`;
-    var argsString = arguments.length < 3 ? "" : Array.prototype.slice.call(arguments, 1, -1).map(arg => JSON.stringify(arg)).join(",") + ",";
-    this.evaluateInConsole_(`${functionName}(${argsString} function() { console.log('${doneMessage}'); });`, function() {});
-    WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage);
 
     function onConsoleMessage(event)
     {
         var text = event.data.messageText;
-        if (text === doneMessage) {
+        if (text === "DONE") {
             WebInspector.multitargetConsoleModel.removeEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage);
-            callback();
+            pageActionsDone();
         }
     }
-}
 
-TestSuite.prototype.invokeAsyncWithTimeline_ = function(functionName, callback)
-{
-    var test = this;
-
-    this.startTimeline(onRecordingStarted);
-
-    function onRecordingStarted()
+    function pageActionsDone()
     {
-        test.invokePageFunctionAsync(functionName, pageActionsDone);
+        WebInspector.panels.timeline._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onRecordingStopped);
+        WebInspector.panels.timeline._toggleRecording();
     }
 
-    function pageActionsDone()
+    function onRecordingStopped()
     {
-        test.stopTimeline(callback);
+        WebInspector.panels.timeline._model.removeEventListener(WebInspector.TimelineModel.Events.RecordingStopped, onRecordingStopped);
+        callback();
     }
 };
 
-TestSuite.prototype.enableExperiment = function(name)
-{
-    Runtime.experiments.enableForTest(name);
-}
-
-TestSuite.prototype.checkInputEventsPresent = function()
-{
-    var expectedEvents = new Set(arguments);
-    var model = WebInspector.panels.timeline._model;
-    var asyncEvents = model.mainThreadAsyncEvents();
-    var input = asyncEvents.get(WebInspector.TimelineUIUtils.asyncEventGroups().input) || [];
-    var prefix = "InputLatency::";
-    for (var e of input) {
-        if (!e.name.startsWith(prefix))
-            continue;
-        expectedEvents.delete(e.name.substr(prefix.length));
-    }
-    if (expectedEvents.size)
-        throw "Some expected events are not found: " + Array.from(expectedEvents.keys()).join(",");
-}
-
 /**
  * Serializes array of uiSourceCodes to string.
  * @param {!Array.<!WebInspectorUISourceCode>} uiSourceCodes