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

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

 // 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.
 
 #ifndef NGBlockNode_h
 #define NGBlockNode_h
 
 #include "core/CoreExport.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/ng/ng_layout_input_node.h"
 #include "core/layout/ng/ng_layout_result.h"
 #include "core/layout/ng/ng_physical_box_fragment.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class ComputedStyle;
 class LayoutObject;
 class NGBreakToken;
 class NGConstraintSpace;
 class NGLayoutResult;
 struct NGLogicalOffset;
-struct MinMaxContentSize;
+struct MinAndMaxContentSizes;
 
 // Represents a node to be laid out.
 class CORE_EXPORT NGBlockNode final : public NGLayoutInputNode {
   friend NGLayoutInputNode;
 
  public:
   explicit NGBlockNode(LayoutObject*);
 
   // TODO(layout-ng): make it private and declare a friend class to use in tests
   explicit NGBlockNode(ComputedStyle*);
 
   ~NGBlockNode() override;
 
   RefPtr<NGLayoutResult> Layout(NGConstraintSpace* constraint_space,
                                 NGBreakToken* break_token = nullptr) override;
   NGLayoutInputNode* NextSibling() override;
   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;
 
   NGLayoutInputNode* FirstChild();
 
   void SetNextSibling(NGLayoutInputNode*);
   void SetFirstChild(NGLayoutInputNode*);
 
   DECLARE_VIRTUAL_TRACE();
 
@@ skipping 30 matching lines @@
 
 DEFINE_TYPE_CASTS(NGBlockNode,
                   NGLayoutInputNode,
                   node,
                   node->Type() == NGLayoutInputNode::kLegacyBlock,
                   node.Type() == NGLayoutInputNode::kLegacyBlock);
 
 }  // namespace blink
 
 #endif  // NGBlockNode