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

components/printing/test/print_mock_render_thread.cc

 // Copyright (c) 2012 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.
 
 #include "components/printing/test/print_mock_render_thread.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/printing/test/mock_printer.h"
 #include "ipc/ipc_sync_message.h"
 #include "printing/features/features.h"
 #include "printing/page_range.h"
 #include "printing/print_job_constants.h"
-#include "printing/units.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "components/printing/common/print_messages.h"
 #endif
 
 PrintMockRenderThread::PrintMockRenderThread()
 #if BUILDFLAG(ENABLE_PRINTING)
     : printer_(new MockPrinter),
       print_dialog_user_response_(true),
@@ skipping 127 matching lines @@
           !dict->GetInteger(printing::kSettingPageRangeTo, &range.to)) {
         continue;
       }
       // Page numbers are 1-based in the dictionary.
       // Page numbers are 0-based for the printing context.
       range.from--;
       range.to--;
       new_ranges.push_back(range);
     }
   }
+  std::vector<int> pages(printing::PageRange::GetPages(new_ranges));
+  printer_->UpdateSettings(document_cookie, params, pages, margins_type);
 
-  // Get media size
-  const base::DictionaryValue* media_size_value = nullptr;
-  gfx::Size page_size;
-  if (job_settings.GetDictionary(printing::kSettingMediaSize,
-                                 &media_size_value)) {
-    int width_microns = 0;
-    int height_microns = 0;
-    if (media_size_value->GetInteger(printing::kSettingMediaSizeWidthMicrons,
-                                     &width_microns) &&
-        media_size_value->GetInteger(printing::kSettingMediaSizeHeightMicrons,
-                                     &height_microns)) {
-      float device_microns_per_unit =
-          (printing::kHundrethsMMPerInch * 10.0f) / printing::kDefaultPdfDpi;
-      page_size = gfx::Size(width_microns / device_microns_per_unit,
-                            height_microns / device_microns_per_unit);
-    }
-  }
-
-  // Get scaling
-  int scale_factor = 100;
-  job_settings.GetInteger(printing::kSettingScaleFactor, &scale_factor);
-
-  std::vector<int> pages(printing::PageRange::GetPages(new_ranges));
-  printer_->UpdateSettings(document_cookie, params, pages, margins_type,
-                           page_size, scale_factor);
   job_settings.GetBoolean(printing::kSettingShouldPrintSelectionOnly,
                           &params->params.selection_only);
   job_settings.GetBoolean(printing::kSettingShouldPrintBackgrounds,
                           &params->params.should_print_backgrounds);
 }
 
 MockPrinter* PrintMockRenderThread::printer() {
   return printer_.get();
 }
 
 void PrintMockRenderThread::set_print_dialog_user_response(bool response) {
   print_dialog_user_response_ = response;
 }
 
 void PrintMockRenderThread::set_print_preview_cancel_page_number(int page) {
   print_preview_cancel_page_number_ = page;
 }
 
 int PrintMockRenderThread::print_preview_pages_remaining() const {
   return print_preview_pages_remaining_;
 }
 #endif  // BUILDFLAG(ENABLE_PRINTING)