Fix tests for upcoming DevTools change

Test changes required for
https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2016757

Bug: 1006759
Change-Id: I54e7e0241033b22749da2261029868c4c86b007e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016635
Auto-Submit: Tim van der Lippe <tvanderlippe@chromium.org>
Reviewed-by: Paul Lewis <aerotwist@chromium.org>
Commit-Queue: Tim van der Lippe <tvanderlippe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734486}

third_party/blink/web_tests/TestExpectations

@@ -5379,7 +5379,6 @@ crbug.com/911515 [ Mac ] transforms/shadows.html [ Pass Failure ]
 crbug.com/911782 [ Mac ] paint/invalidation/forms/submit-focus-by-mouse-then-keydown.html [ Pass Failure ]
 
 # Sheriff 2018-12-06
-crbug.com/912793 http/tests/devtools/sources/debugger-breakpoints/restore-locations-for-breakpoint-with-broken-source-map.js [ Pass Failure ]
 crbug.com/912793 crbug.com/899087 virtual/android/fullscreen/full-screen-iframe-allowed-video.html [ Crash Pass Failure Timeout ]
 
 # Sheriff 2018-12-07
@@ -6384,3 +6383,8 @@ crbug.com/1043675 [ Linux ] virtual/threaded-no-composited-antialiasing/animatio
 # The transformed region bleeds into the foreground with SkiaRenderer enabled.
 crbug.com/1044032 [ Linux ] css3/filters/backdrop-filter-transform.html [ Failure ]
 crbug.com/1044032 [ Linux ] virtual/scalefactor200/css3/filters/backdrop-filter-transform.html [ Failure ]
+
+# Required to land DevTools change
+crbug.com/106759 http/tests/devtools/command-line-api-inspect.js [ Pass Failure ]
+crbug.com/106759 http/tests/devtools/sources/debugger-breakpoints/restore-locations-for-breakpoint-with-broken-source-map.js [ Pass Failure ]
+crbug.com/106759 http/tests/devtools/sources/debugger-console/debugger-command-line-api.js [ Pass Failure ]

third_party/blink/web_tests/http/tests/devtools/command-line-api-inspect.js

@@ -28,15 +28,15 @@
   }
 
   TestRunner.runTestSuite([function testRevealElement(next) {
-    TestRunner.addSniffer(Common.Revealer, 'reveal', step2, true);
+    const originalReveal = Common.Revealer.reveal;
+    Common.Revealer.setRevealForTest((node) => {
+      if (!(node instanceof SDK.RemoteObject)) {
+        return Promise.resolve();
+      }
+      return originalReveal(node).then(step3);
+    });
     evalAndDump('inspect($(\'#p1\'))');
 
-    function step2(node, revealPromise) {
-      if (!(node instanceof SDK.RemoteObject))
-        return;
-      revealPromise.then(step3);
-    }
-
     function step3() {
       TestRunner.addResult('Selected node id: \'' + UI.panels.elements.selectedDOMNode().getAttribute('id') + '\'.');
       next();

third_party/blink/web_tests/http/tests/devtools/sources/debugger-breakpoints/restore-locations-for-breakpoint-with-broken-source-map.js

@@ -24,14 +24,14 @@
   let stopRequest;
   let sourceMapRequested;
   let sourceMapRequest = new Promise(resolve => sourceMapRequested = resolve);
-  Host.ResourceLoader.load = function(url, headers, callback){
+  Host.ResourceLoader.setLoad(function(url, headers, callback){
     if (url.endsWith('a.js.map')) {
       stopRequest = () => callback(404);
       sourceMapRequested();
       return;
     }
     return origLoad.apply(this, arguments);
-  }
+  });
 
   await TestRunner.evaluateInPageAnonymously(`function foo() {
   console.log(42);

third_party/blink/web_tests/http/tests/devtools/sources/debugger-console/debugger-command-line-api.js

@@ -20,13 +20,13 @@
   `);
 
   TestRunner.addSniffer(SDK.RuntimeModel.prototype, '_inspectRequested', inspect);
-  TestRunner.addSniffer(Common.Revealer, 'reveal', oneRevealPromise, true);
-
-  function oneRevealPromise(node, revealPromise) {
-    if (!(node instanceof SDK.RemoteObject))
-      return;
-    revealPromise.then(updateFocusedNode);
-  }
+  const originalReveal = Common.Revealer.reveal;
+  Common.Revealer.setRevealForTest((node) => {
+    if (!(node instanceof SDK.RemoteObject)) {
+      return Promise.resolve();
+    }
+    return originalReveal(node).then(updateFocusedNode);
+  });
 
   function updateFocusedNode() {
     TestRunner.addResult('Selected node id: \'' + UI.panels.elements.selectedDOMNode().getAttribute('id') + '\'.');