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

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

Index: third_party/WebKit/Source/core/layout/ng/ng_block_node.h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.h b/third_party/WebKit/Source/core/layout/ng/ng_block_node.h
index 9e1ee7e5ee11d3f965a06b0c55ef106497080078..04d2311e1beacf9d607584453f08260a4921c2ef 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.h
@@ -20,7 +20,7 @@
 class NGConstraintSpace;
 class NGLayoutResult;
 struct NGLogicalOffset;
-struct MinMaxContentSize;
+struct MinAndMaxContentSizes;
 
 // Represents a node to be laid out.
 class CORE_EXPORT NGBlockNode final : public NGLayoutInputNode {
@@ -40,12 +40,12 @@
   LayoutObject* GetLayoutObject() override;
 
   // Computes the value of min-content and max-content for this box.
-  // If the underlying layout algorithm's ComputeMinMaxContentSize returns
+  // If the underlying layout algorithm's ComputeMinAndMaxContentSizes returns
   // no value, this function will synthesize these sizes using Layout with
   // special constraint spaces -- infinite available size for max content, zero
   // available size for min content, and percentage resolution size zero for
   // both.
-  MinMaxContentSize ComputeMinMaxContentSize();
+  MinAndMaxContentSizes ComputeMinAndMaxContentSizes();
 
   const ComputedStyle& Style() const;