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

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

Index: third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
index b1e55d95f58fd3bedc9bcfeaef5c805874f05d9f..7d5b148457f872d9dcc3b2376805b4e77ce8d841 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
@@ -262,7 +262,7 @@
   NGTextLayoutAlgorithm(this, constraint_space).LayoutInline(line_builder);
 }
 
-MinMaxContentSize NGInlineNode::ComputeMinMaxContentSize() {
+MinAndMaxContentSizes NGInlineNode::ComputeMinAndMaxContentSizes() {
   // Compute the max of inline sizes of all line boxes with 0 available inline
   // size. This gives the min-content, the width where lines wrap at every break
   // opportunity.
@@ -275,7 +275,7 @@
           .ToConstraintSpace(writing_mode);
   NGLineBuilder line_builder(this, constraint_space);
   LayoutInline(constraint_space, &line_builder);
-  MinMaxContentSize sizes;
+  MinAndMaxContentSizes sizes;
   sizes.min_content = line_builder.MaxInlineSize();
 
   // max-content is the width without any line wrapping.