Revert of Add automated testing to check for page size with scaling

components/printing/renderer/print_web_view_helper.cc

Index: components/printing/renderer/print_web_view_helper.cc
diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc
index a793497bed148446d8f7829485c1d3bc41ee64d0..b5e829ca1eeff6845049355eabb99c6d81a057b7 100644
--- a/components/printing/renderer/print_web_view_helper.cc
+++ b/components/printing/renderer/print_web_view_helper.cc
@@ -1843,15 +1843,9 @@
 
   double css_scale_factor = 1.0f;
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-  if (params.params.scale_factor >= kEpsilon)
-    css_scale_factor = params.params.scale_factor;
+    if (params.params.scale_factor >= kEpsilon)
+      css_scale_factor = params.params.scale_factor;
 #endif
-
-  // Save the original page size here to avoid rounding errors incurred by
-  // converting to pixels and back and by scaling the page for reflow and
-  // scaling back. Windows uses |page_size_in_dpi| for the actual page size
-  // so requires an accurate value.
-  gfx::Size original_page_size = params.params.page_size;
   ComputePageLayoutInPointsForCss(frame, params.page_number, params.params,
                                   ignore_css_margins_, &css_scale_factor,
                                   &page_layout_in_points);
@@ -1859,10 +1853,19 @@
   gfx::Rect content_area;
   GetPageSizeAndContentAreaFromPageLayout(page_layout_in_points, &page_size,
                                           &content_area);
-
+  int dpi = static_cast<int>(params.params.dpi);
   // Calculate the actual page size and content area in dpi.
   if (page_size_in_dpi) {
-    *page_size_in_dpi = original_page_size;
+    // Windows uses this for the actual page size. We have scaled page size
+    // to get blink to reflow the page, so scale it back to the real size
+    // before returning it.
+    *page_size_in_dpi =
+        gfx::Size(static_cast<int>(ConvertUnitDouble(page_size.width(),
+                                                     kPointsPerInch, dpi) *
+                                   css_scale_factor),
+                  static_cast<int>(ConvertUnitDouble(page_size.height(),
+                                                     kPointsPerInch, dpi) *
+                                   css_scale_factor));
   }
 
   if (content_area_in_dpi) {