Deflake styles-disable-inherited_test.ts

This reverts the changes of https://crrev.com/c/6298060 for this test
which likely introduced the flakiness.

Bug: none
Change-Id: If373e18c88d2733f5fa9f0dda12527daa41d811b
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6346611
Reviewed-by: Nikolay Vitkov <[email protected]>
Auto-Submit: Philip Pfaffe <[email protected]>
Commit-Queue: Philip Pfaffe <[email protected]>

Author: pfaffe

test/e2e/elements/styles-disable-inherited_test.ts

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {click, goToResource, waitFor, waitForFunction} from '../../shared/helper.js';
+import {click, goToResource, waitFor} from '../../shared/helper.js';
 import {
   checkStyleAttributes,
   expandSelectedNodeRecursively,
   uncheckStylesPaneCheckbox,
+  waitForElementsStyleSection,
 } from '../helpers/elements-helpers.js';
 
 describe('The Elements tab', function() {
@@ -17,18 +18,15 @@ describe('The Elements tab', function() {
     await click('text/nested', {
       root: elementsContentPanel,
     });
-    await waitForFunction(
-        () => checkStyleAttributes(['display: block;', 'unicode-bidi: isolate;', 'font-weight: bold;']));
+    await waitForElementsStyleSection(null);
+    await checkStyleAttributes(['display: block;', 'font-weight: bold;']);
     await click('text/container', {
       root: elementsContentPanel,
     });
     await uncheckStylesPaneCheckbox('font-weight bold');
     await click('text/nested', {
       root: elementsContentPanel,
     });
-    await waitForFunction(() => checkStyleAttributes([
-                            'display: block;',
-                            'unicode-bidi: isolate;',
-                          ]));
+    await checkStyleAttributes(['display: block;']);
   });
 });

test/e2e/helpers/elements-helpers.ts

@@ -292,13 +292,15 @@ export const navigateToSidePane = async (paneName: string) => {
   ]);
 };
 
-export const waitForElementsStyleSection = async () => {
+export const waitForElementsStyleSection = async (expectedNodeText: string|null = '<body') => {
   // Wait for the file to be loaded and selectors to be shown
   await waitFor('.styles-selector');
   await expectVeEvents([veImpressionsUnder('Panel: elements', [veImpression('Pane', 'styles')])]);
 
   // Check to make sure we have the correct node selected after opening a file.
-  await waitForPartialContentOfSelectedElementsNode('<body');
+  if (expectedNodeText) {
+    await waitForPartialContentOfSelectedElementsNode(expectedNodeText);
+  }
 };
 
 export const waitForElementsComputedSection = async () => {