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

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

Index: third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc
index 2392617bb25b226db32c33d25b5b702851c2f50f..656723f22b6f477156d9c01f5b1bfa275a64b93c 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc
@@ -5,7 +5,6 @@
 #include "core/layout/ng/ng_block_node.h"
 
 #include "core/layout/ng/ng_box_fragment.h"
-#include "core/layout/ng/ng_min_max_content_size.h"
 #include "core/style/ComputedStyle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -28,7 +27,7 @@
   NGBlockNode* box = new NGBlockNode(style_.get());
   box->SetFirstChild(first_child);
 
-  MinMaxContentSize sizes = box->ComputeMinMaxContentSize();
+  MinAndMaxContentSizes sizes = box->ComputeMinAndMaxContentSizes();
   EXPECT_EQ(LayoutUnit(kWidth), sizes.min_content);
   EXPECT_EQ(LayoutUnit(kWidth), sizes.max_content);
 }