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

components/printing/test/mock_printer.cc

 // Copyright 2014 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/mock_printer.h"
 
 #include "base/files/file_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 22 matching lines @@
     params->margin_left = static_cast<int>(0.25 * dpi);
     params->margin_top = static_cast<int>(0.25 * dpi);
   } else if (margins_type == printing::CUSTOM_MARGINS) {
     params->content_size.SetSize(static_cast<int>((7.9 * dpi)),
                                  static_cast<int>((10.4 * dpi)));
     params->margin_left = static_cast<int>(0.30 * dpi);
     params->margin_top = static_cast<int>(0.30 * dpi);
   }
 }
 
-void UpdatePageSizeAndScaling(const gfx::Size& page_size,
-                              int scale_factor,
-                              PrintMsg_Print_Params* params) {
-  params->page_size = page_size;
-  params->scale_factor = static_cast<double>(scale_factor) / 100.0;
-}
-
 }  // namespace
 
 MockPrinterPage::MockPrinterPage(const void* source_data,
                                  uint32_t source_size,
                                  const printing::Image& image)
     : source_size_(source_size), image_(image) {
   // Create copies of the source data
   source_data_.reset(new uint8_t[source_size]);
   if (source_data_.get())
     memcpy(source_data_.get(), source_data, source_size);
@@ skipping 101 matching lines @@
   settings->params.preview_request_id = preview_request_id_;
   settings->params.display_header_footer = display_header_footer_;
   settings->params.title = title_;
   settings->params.url = url_;
   printer_status_ = PRINTER_PRINTING;
 }
 
 void MockPrinter::UpdateSettings(int cookie,
                                  PrintMsg_PrintPages_Params* params,
                                  const std::vector<int>& pages,
-                                 int margins_type,
-                                 const gfx::Size& page_size,
-                                 int scale_factor) {
+                                 int margins_type) {
   if (document_cookie_ == -1) {
     document_cookie_ = CreateDocumentCookie();
   }
   params->Reset();
   params->pages = pages;
   SetPrintParams(&(params->params));
   UpdateMargins(margins_type, dpi_, &(params->params));
-  if (!page_size.IsEmpty())
-    UpdatePageSizeAndScaling(page_size, scale_factor, &params->params);
   printer_status_ = PRINTER_PRINTING;
 }
 
 void MockPrinter::SetPrintedPagesCount(int cookie, int number_pages) {
   // Verify the input parameter and update the printer status so that the
   // RenderViewTest class can verify the this function finishes without errors.
   EXPECT_EQ(document_cookie_, cookie);
   EXPECT_EQ(PRINTER_PRINTING, printer_status_);
   EXPECT_EQ(0, number_pages_);
   EXPECT_EQ(0, page_number_);
@@ skipping 107 matching lines @@
   params->margin_left = margin_left_;
   params->margin_top = margin_top_;
   params->is_first_request = is_first_request_;
   params->print_scaling_option = print_scaling_option_;
   params->print_to_pdf = print_to_pdf_;
   params->preview_request_id = preview_request_id_;
   params->display_header_footer = display_header_footer_;
   params->title = title_;
   params->url = url_;
 }