Merge LayoutNGInline into LayoutNG runtime enabled feature

third_party/WebKit/Source/web/tests/NGInlineLayoutTest.cpp

 // Copyright 2016 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 "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_inline_node.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ skipping 16 matching lines @@
         .SetAvailableSize(NGLogicalSize(LayoutUnit(), LayoutUnit()))
         .SetPercentageResolutionSize(NGLogicalSize(LayoutUnit(), LayoutUnit()))
         .SetTextDirection(blockFlow->style()->direction())
         .ToConstraintSpace(
             FromPlatformWritingMode(blockFlow->style()->getWritingMode()));
   }
 };
 
 TEST_F(NGInlineLayoutTest, BlockWithSingleTextNode) {
   RuntimeEnabledFeatures::setLayoutNGEnabled(true);
-  RuntimeEnabledFeatures::setLayoutNGInlineEnabled(true);
 
   SimRequest mainResource("https://example.com/", "text/html");
   loadURL("https://example.com/");
   mainResource.complete(
       "<div id=\"target\">Hello <strong>World</strong>!</div>");
 
   compositor().beginFrame();
   ASSERT_FALSE(compositor().needsBeginFrame());
 
   Element* target = document().getElementById("target");
   LayoutNGBlockFlow* blockFlow = toLayoutNGBlockFlow(target->layoutObject());
   RefPtr<NGConstraintSpace> constraintSpace =
       constraintSpaceForElement(blockFlow);
   NGBlockNode* node = new NGBlockNode(blockFlow);
 
   RefPtr<NGLayoutResult> result =
       NGBlockLayoutAlgorithm(node, constraintSpace.get()).Layout();
   EXPECT_TRUE(result);
 
   String expectedText("Hello World!");
   EXPECT_EQ(expectedText, toNGInlineNode(node->FirstChild())->Text(0, 12));
 }
 
 TEST_F(NGInlineLayoutTest, BlockWithTextAndAtomicInline) {
   RuntimeEnabledFeatures::setLayoutNGEnabled(true);
-  RuntimeEnabledFeatures::setLayoutNGInlineEnabled(true);
 
   SimRequest mainResource("https://example.com/", "text/html");
   loadURL("https://example.com/");
   mainResource.complete("<div id=\"target\">Hello <img>.</div>");
 
   compositor().beginFrame();
   ASSERT_FALSE(compositor().needsBeginFrame());
 
   Element* target = document().getElementById("target");
   LayoutNGBlockFlow* blockFlow = toLayoutNGBlockFlow(target->layoutObject());
   RefPtr<NGConstraintSpace> constraintSpace =
       constraintSpaceForElement(blockFlow);
   NGBlockNode* node = new NGBlockNode(blockFlow);
 
   RefPtr<NGLayoutResult> result =
       NGBlockLayoutAlgorithm(node, constraintSpace.get()).Layout();
   EXPECT_TRUE(result);
 
   String expectedText("Hello ");
   expectedText.append(objectReplacementCharacter);
   expectedText.append(".");
   EXPECT_EQ(expectedText, toNGInlineNode(node->FirstChild())->Text(0, 8));
 
   // Delete the line box tree to avoid leaks in the test.
   blockFlow->deleteLineBoxTree();
 }
 
 }  // namespace blink