Revert of [LayoutNG] Move remaining ng_units structs to their own files

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

Index: third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
index 007bf60539ac7529f96a00375258acee83f681a6..6764cb163b7e3b59a707f74d1b8b9c87852112a5 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
@@ -17,7 +17,6 @@
 #include "core/layout/ng/ng_inline_node.h"
 #include "core/layout/ng/ng_layout_result.h"
 #include "core/layout/ng/ng_length_utils.h"
-#include "core/layout/ng/ng_min_max_content_size.h"
 #include "core/layout/ng/ng_writing_mode.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ -105,8 +104,8 @@
   return layout_result_;
 }
 
-MinMaxContentSize NGBlockNode::ComputeMinMaxContentSize() {
-  MinMaxContentSize sizes;
+MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizes() {
+  MinAndMaxContentSizes sizes;
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
     // TODO(layout-ng): This could be somewhat optimized by directly calling
@@ -132,8 +131,8 @@
 
   // TODO(cbiesinger): For orthogonal children, we need to always synthesize.
   NGBlockLayoutAlgorithm minmax_algorithm(this, constraint_space);
-  Optional<MinMaxContentSize> maybe_sizes =
-      minmax_algorithm.ComputeMinMaxContentSize();
+  Optional<MinAndMaxContentSizes> maybe_sizes =
+      minmax_algorithm.ComputeMinAndMaxContentSizes();
   if (maybe_sizes.has_value())
     return *maybe_sizes;