Revert of Use Opportunity Iterator to position text fragments in NGLineBuilder

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
index 2d850cc959279d0993a3e210e9342b82b3b5587c..c9648b95913e913201f0f01288327c53523381ac 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
@@ -8,7 +8,6 @@
 #include "core/dom/TagCollection.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
-#include "core/layout/ng/ng_base_layout_algorithm_test.h"
 #include "core/layout/ng/ng_block_break_token.h"
 #include "core/layout/ng/ng_block_node.h"
 #include "core/layout/ng/ng_constraint_space.h"
@@ -19,6 +18,7 @@
 #include "core/layout/ng/ng_physical_fragment.h"
 #include "core/style/ComputedStyle.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 namespace {
@@ -48,11 +48,25 @@
       .ToConstraintSpace(writing_mode);
 }
 
-class NGBlockLayoutAlgorithmTest : public NGBaseLayoutAlgorithmTest {
+typedef bool TestParamLayoutNG;
+class NGBlockLayoutAlgorithmTest
+    : public ::testing::WithParamInterface<TestParamLayoutNG>,
+      public RenderingTest {
+ public:
+  NGBlockLayoutAlgorithmTest() {
+    RuntimeEnabledFeatures::setLayoutNGEnabled(true);
+    RuntimeEnabledFeatures::setLayoutNGInlineEnabled(true);
+  }
+  ~NGBlockLayoutAlgorithmTest() {
+    RuntimeEnabledFeatures::setLayoutNGEnabled(false);
+    RuntimeEnabledFeatures::setLayoutNGInlineEnabled(false);
+  }
+
  protected:
   void SetUp() override {
-    NGBaseLayoutAlgorithmTest::SetUp();
     style_ = ComputedStyle::create();
+    RenderingTest::SetUp();
+    enableCompositing();
   }
 
   RefPtr<NGPhysicalBoxFragment> RunBlockLayoutAlgorithm(
@@ -62,6 +76,20 @@
         NGBlockLayoutAlgorithm(node, space).Layout();
 
     return toNGPhysicalBoxFragment(result->PhysicalFragment().get());
+  }
+
+  std::pair<RefPtr<NGPhysicalBoxFragment>, RefPtr<NGConstraintSpace>>
+  RunBlockLayoutAlgorithmForElement(Element* element) {
+    LayoutNGBlockFlow* block_flow =
+        toLayoutNGBlockFlow(element->layoutObject());
+    NGBlockNode* node = new NGBlockNode(block_flow);
+    RefPtr<NGConstraintSpace> space =
+        NGConstraintSpace::CreateFromLayoutObject(*block_flow);
+
+    RefPtr<NGLayoutResult> result =
+        NGBlockLayoutAlgorithm(node, space.get()).Layout();
+    return std::make_pair(
+        toNGPhysicalBoxFragment(result->PhysicalFragment().get()), space);
   }
 
   MinMaxContentSize RunComputeMinAndMax(NGBlockNode* node) {