tests: Use runPendingTasks instead of WebThread::enterRunLoop()/exitRunLoop()

Source/web/tests/TextFinderTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "web/TextFinder.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeList.h"
 #include "core/dom/Range.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLElement.h"
+#include "core/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/web/WebDocument.h"
 #include "web/FindInPageCoordinates.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/OwnPtr.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
+using blink::testing::runPendingTasks;
 
 namespace {
 
 class TextFinderTest : public ::testing::Test {
 protected:
     virtual void SetUp() override;
 
     Document& document() const;
     TextFinder& textFinder() const;
 
@@ skipping 209 matching lines @@
     document().body()->setInnerHTML("XXXXFindMeYYYYfindmeZZZZ", ASSERT_NO_EXCEPTION);
     Node* textNode = document().body()->firstChild();
 
     int identifier = 0;
     WebString searchText(String("FindMe"));
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
     textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     EXPECT_EQ(2, textFinder().totalMatchCount());
     WebVector<WebFloatRect> matchRects;
     textFinder().findMatchRects(matchRects);
     ASSERT_EQ(2u, matchRects.size());
     EXPECT_EQ(findInPageRect(textNode, 4, textNode, 10), matchRects[0]);
     EXPECT_EQ(findInPageRect(textNode, 14, textNode, 20), matchRects[1]);
 }
 
 TEST_F(TextFinderTest, ScopeTextMatchesWithShadowDOM)
 {
     document().body()->setInnerHTML("<b>FOO</b><i>foo</i>", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = document().body()->createShadowRoot(ASSERT_NO_EXCEPTION);
     shadowRoot->setInnerHTML("<content select=\"i\"></content><u>Foo</u><content></content>", ASSERT_NO_EXCEPTION);
     Node* textInBElement = document().body()->firstChild()->firstChild();
     Node* textInIElement = document().body()->lastChild()->firstChild();
     Node* textInUElement = shadowRoot->childNodes()->item(1)->firstChild();
 
     int identifier = 0;
     WebString searchText(String("fOO"));
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
     textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     // TextIterator currently returns the matches in the document order, instead of the visual order. It visits
     // the shadow roots first, so in this case the matches will be returned in the order of <u> -> <b> -> <i>.
     EXPECT_EQ(3, textFinder().totalMatchCount());
     WebVector<WebFloatRect> matchRects;
     textFinder().findMatchRects(matchRects);
     ASSERT_EQ(3u, matchRects.size());
     EXPECT_EQ(findInPageRect(textInUElement, 0, textInUElement, 3), matchRects[0]);
     EXPECT_EQ(findInPageRect(textInBElement, 0, textInBElement, 3), matchRects[1]);
     EXPECT_EQ(findInPageRect(textInIElement, 0, textInIElement, 3), matchRects[2]);
 }
 
 TEST_F(TextFinderTest, ScopeRepeatPatternTextMatches)
 {
     document().body()->setInnerHTML("ab ab ab ab ab", ASSERT_NO_EXCEPTION);
     Node* textNode = document().body()->firstChild();
 
     int identifier = 0;
     WebString searchText(String("ab ab"));
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
     textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     EXPECT_EQ(2, textFinder().totalMatchCount());
     WebVector<WebFloatRect> matchRects;
     textFinder().findMatchRects(matchRects);
     ASSERT_EQ(2u, matchRects.size());
     EXPECT_EQ(findInPageRect(textNode, 0, textNode, 5), matchRects[0]);
     EXPECT_EQ(findInPageRect(textNode, 6, textNode, 11), matchRects[1]);
 }
 
 TEST_F(TextFinderTest, OverlappingMatches)
 {
     document().body()->setInnerHTML("aababaa", ASSERT_NO_EXCEPTION);
     Node* textNode = document().body()->firstChild();
 
     int identifier = 0;
     WebString searchText(String("aba"));
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
     textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     // We shouldn't find overlapped matches.
     EXPECT_EQ(1, textFinder().totalMatchCount());
     WebVector<WebFloatRect> matchRects;
     textFinder().findMatchRects(matchRects);
     ASSERT_EQ(1u, matchRects.size());
     EXPECT_EQ(findInPageRect(textNode, 1, textNode, 4), matchRects[0]);
 }
 
 TEST_F(TextFinderTest, SequentialMatches)
 {
     document().body()->setInnerHTML("ababab", ASSERT_NO_EXCEPTION);
     Node* textNode = document().body()->firstChild();
 
     int identifier = 0;
     WebString searchText(String("ab"));
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
     textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     EXPECT_EQ(3, textFinder().totalMatchCount());
     WebVector<WebFloatRect> matchRects;
     textFinder().findMatchRects(matchRects);
     ASSERT_EQ(3u, matchRects.size());
     EXPECT_EQ(findInPageRect(textNode, 0, textNode, 2), matchRects[0]);
     EXPECT_EQ(findInPageRect(textNode, 2, textNode, 4), matchRects[1]);
     EXPECT_EQ(findInPageRect(textNode, 4, textNode, 6), matchRects[2]);
 }
 
@@ skipping 104 matching lines @@
 
     int identifier = 0;
     WebFindOptions findOptions; // Default.
 
     textFinder().resetMatchCount();
 
     // There will be only one iteration before timeout, because increment
     // of the TimeProxyPlatform timer is greater than timeout threshold.
     textFinder().scopeStringMatches(identifier, searchPattern, findOptions, true);
     while (textFinder().scopingInProgress())
-        FrameTestHelpers::runPendingTasks();
+        runPendingTasks();
 
     EXPECT_EQ(4, textFinder().totalMatchCount());
 }
 
 } // namespace