DevTools: fix elements-panel-restore-selection-when-node-comes-later.js

BUG=660295
TBR=dgozman

Change-Id: I977dc25453e2dbe0f92e95bf1111d6122de747b7
Reviewed-on: https://chromium-review.googlesource.com/828148
Commit-Queue: Andrey Lushnikov <lushnikov@chromium.org>
Reviewed-by: Andrey Lushnikov <lushnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524291}

third_party/WebKit/LayoutTests/TestExpectations

@@ -2583,7 +2583,6 @@ crbug.com/701047 [ Mac10.12 ] editing/style/block-style-002.html [ Failure ]
 crbug.com/701047 [ Mac10.12 ] editing/style/block-style-003.html [ Failure ]
 crbug.com/701047 [ Mac10.12 ] editing/style/block-styles-007.html [ Failure ]
 
-crbug.com/660295 http/tests/devtools/elements/elements-panel-restore-selection-when-node-comes-later.js [ Pass Failure ]
 crbug.com/735245 http/tests/devtools/application-panel/storage-view-reports-quota.js [ Pass Timeout Failure ]
 
 # [css-grid]

third_party/WebKit/LayoutTests/http/tests/devtools/elements/elements-panel-restore-selection-when-node-comes-later-expected.txt

@@ -5,6 +5,7 @@ Running: selectNode
 Selected node: 'span'
 
 Running: firstReloadWithoutNodeInDOM
+Page reloaded.
 Selected node: 'body'
 
 Running: secondReloadWithNodeInDOM

third_party/WebKit/LayoutTests/http/tests/devtools/elements/elements-panel-restore-selection-when-node-comes-later.js

@@ -7,16 +7,7 @@
       `Verify that last selected element is restored properly later, even if it failed to do so once.\n`);
   await TestRunner.loadModule('elements_test_runner');
   await TestRunner.showPanel('elements');
-  await TestRunner.loadHTML(`
-      <p>
-      Verify that last selected element is restored properly later, even if
-      it failed to do so once.
-      </p>
-      <div>
-          <span id="inspected"></span>
-      </div>
-    `);
-  await TestRunner.addScriptTag('../resources/elements-panel-shadow-selection-on-refresh.js');
+  await TestRunner.navigatePromise('./resources/elements-panel-restore-selection-when-node-comes-later.html');
 
   var node;
 
@@ -80,17 +71,15 @@
   }
 
   /**
-     * @param {string} pathToIgnore
-     */
+   * @param {string} pathToIgnore
+   */
   function overridePushNodeForPath(pathToIgnore) {
     var original = TestRunner.override(SDK.DOMModel.prototype, 'pushNodeByPathToFrontend', override);
 
-    function override(nodePath, callback) {
-      if (nodePath === pathToIgnore) {
-        setTimeout(callback.bind(null), 0);
-        return;
-      }
-      original(nodePath, callback);
+    function override(nodePath) {
+      if (nodePath === pathToIgnore)
+        return Promise.resolve(null);
+      return original(nodePath);
     }
   }
 })();

third_party/WebKit/LayoutTests/http/tests/devtools/elements/resources/elements-panel-restore-selection-when-node-comes-later.html

+<div>
+  <span id="inspected"></span>
+</div>