Revert of [LayoutNG] Remove simple constructors from NGPhysicalConstraintSpace.

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

Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc
index 6095e4f6ef55097641374a65788086f13c1ef3f9..cb9085c6e29134e85402a3ab4defc37aac2c9922 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc
@@ -12,18 +12,6 @@
 namespace blink {
 
 namespace {
-
-NGConstraintSpace* ConstructConstraintSpace(NGWritingMode writing_mode,
-                                            NGDirection direction,
-                                            NGPhysicalSize size) {
-  return new NGConstraintSpace(
-      writing_mode, direction,
-      new NGPhysicalConstraintSpace(
-          size, /* fixed_width */ true, /* fixed_height */ false,
-          /* width_direction_triggers_scrollbar */ true,
-          /* height_direction_triggers_scrollbar */ false, FragmentNone,
-          FragmentColumn, /* is_new_fc */ false));
-}
 
 TEST(NGConstraintSpaceTest, WritingMode) {
   NGPhysicalConstraintSpace* phy_space = new NGPhysicalConstraintSpace(
@@ -68,9 +56,10 @@
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
-
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
+
   auto* iterator = space->LayoutOpportunities();
 
   EXPECT_EQ("0,0 600x400", OpportunityToString(iterator->Next()));
@@ -81,13 +70,14 @@
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
-
-  // Create a space with a 100x100 exclusion in the top right corner.
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(600),
-                                      LayoutUnit(100), LayoutUnit(500)));
-
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+
+  // Add a 100x100 exclusion in the top right corner.
+  physical_space->AddExclusion(new NGExclusion(
+      LayoutUnit(0), LayoutUnit(600), LayoutUnit(100), LayoutUnit(500)));
+
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
   auto* iterator = space->LayoutOpportunities();
 
   // First opportunity should be to the left of the exclusion.
@@ -104,13 +94,14 @@
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
-
-  // Create a space with a 100x100 exclusion in the top left corner.
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(100),
-                                      LayoutUnit(100), LayoutUnit(0)));
-
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+
+  // Add a 100x100 exclusion in the top left corner.
+  physical_space->AddExclusion(new NGExclusion(LayoutUnit(0), LayoutUnit(100),
+                                               LayoutUnit(100), LayoutUnit(0)));
+
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
   auto* iterator = space->LayoutOpportunities();
 
   // First opportunity should be to the right of the exclusion.
@@ -150,16 +141,16 @@
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
-
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
 
   // Add exclusions
-  space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250),
-                                      LayoutUnit(300), LayoutUnit(150)));
-  space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550),
-                                      LayoutUnit(400), LayoutUnit(500)));
-
+  physical_space->AddExclusion(new NGExclusion(
+      LayoutUnit(200), LayoutUnit(250), LayoutUnit(300), LayoutUnit(150)));
+  physical_space->AddExclusion(new NGExclusion(
+      LayoutUnit(350), LayoutUnit(550), LayoutUnit(400), LayoutUnit(500)));
+
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
   auto* iterator = space->LayoutOpportunities();
 
   // 1st Start point
@@ -198,16 +189,16 @@
   NGPhysicalSize physical_size;
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(400);
-
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
 
   // Add exclusions
-  space->AddExclusion(new NGExclusion(LayoutUnit(200), LayoutUnit(250),
-                                      LayoutUnit(300), LayoutUnit(150)));
-  space->AddExclusion(new NGExclusion(LayoutUnit(350), LayoutUnit(550),
-                                      LayoutUnit(400), LayoutUnit(500)));
-
+  physical_space->AddExclusion(new NGExclusion(
+      LayoutUnit(200), LayoutUnit(250), LayoutUnit(300), LayoutUnit(150)));
+  physical_space->AddExclusion(new NGExclusion(
+      LayoutUnit(350), LayoutUnit(550), LayoutUnit(400), LayoutUnit(500)));
+
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
   const NGLogicalOffset origin_point = {LayoutUnit(0), LayoutUnit(200)};
   auto* iterator = new NGLayoutOpportunityIterator(space, origin_point);
 
@@ -249,10 +240,11 @@
   physical_size.width = LayoutUnit(600);
   physical_size.height = LayoutUnit(100);
 
-  auto* space =
-      ConstructConstraintSpace(HorizontalTopBottom, LeftToRight, physical_size);
-  space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100),
-                                      LayoutUnit(200), LayoutUnit(0)));
+  auto* physical_space = new NGPhysicalConstraintSpace(physical_size);
+  physical_space->AddExclusion(new NGExclusion(LayoutUnit(150), LayoutUnit(100),
+                                               LayoutUnit(200), LayoutUnit(0)));
+  auto* space =
+      new NGConstraintSpace(HorizontalTopBottom, LeftToRight, physical_space);
 
   auto* iterator = space->LayoutOpportunities();