Mark PrintedDocument::GetCenteredPageContentRect() as static.

The method does not interact with any PrintedDocument member variables.
Simplify its unit test and avoid instantiating a dummy PrintedDocument.

Change-Id: I8478a88a4044c5fce8799f203e483b874bac5c26
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145781Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758276}

printing/printed_document.cc

@@ -280,10 +280,11 @@ void PrintedDocument::DebugDumpData(
 }
 
 #if defined(OS_WIN)
+// static
 gfx::Rect PrintedDocument::GetCenteredPageContentRect(
     const gfx::Size& paper_size,
     const gfx::Size& page_size,
-    const gfx::Rect& page_content_rect) const {
+    const gfx::Rect& page_content_rect) {
   gfx::Rect content_rect = page_content_rect;
   if (paper_size.width() > page_size.width()) {
     int diff = paper_size.width() - page_size.width();

printing/printed_document.h

@@ -124,19 +124,19 @@ class PRINTING_EXPORT PrintedDocument
       const base::string16& document_name,
       const base::FilePath::StringType& extension);
 
-  // Dump data on blocking task runner.
-  // Should only be called when debug dumps are enabled.
-  void DebugDumpData(const base::RefCountedMemory* data,
-                     const base::FilePath::StringType& extension);
-
 #if defined(OS_WIN)
   // Get page content rect adjusted based on
   // http://dev.w3.org/csswg/css3-page/#positioning-page-box
-  gfx::Rect GetCenteredPageContentRect(const gfx::Size& paper_size,
-                                       const gfx::Size& page_size,
-                                       const gfx::Rect& content_rect) const;
+  static gfx::Rect GetCenteredPageContentRect(const gfx::Size& paper_size,
+                                              const gfx::Size& page_size,
+                                              const gfx::Rect& content_rect);
 #endif
 
+  // Dump data on blocking task runner.
+  // Should only be called when debug dumps are enabled.
+  void DebugDumpData(const base::RefCountedMemory* data,
+                     const base::FilePath::StringType& extension);
+
  private:
   friend class base::RefCountedThreadSafe<PrintedDocument>;
 

printing/printed_document_unittest.cc

@@ -3,22 +3,18 @@
 // found in the LICENSE file.
 
 #include "printing/printed_document.h"
-#include "base/strings/utf_string_conversions.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace printing {
 
 TEST(PrintedDocumentTest, GetCenteredPageContentRect) {
-  scoped_refptr<PrintedDocument> document;
   gfx::Rect page_content;
-  const base::string16 name(base::ASCIIToUTF16("name"));
 
   // No centering.
-  document = base::MakeRefCounted<PrintedDocument>(
-      std::make_unique<PrintSettings>(), name, 1);
   gfx::Size page_size = gfx::Size(1200, 1200);
   gfx::Rect page_content_rect = gfx::Rect(0, 0, 400, 1100);
-  page_content = document->GetCenteredPageContentRect(
+  page_content = PrintedDocument::GetCenteredPageContentRect(
       gfx::Size(1000, 1000), page_size, page_content_rect);
   EXPECT_EQ(0, page_content.x());
   EXPECT_EQ(0, page_content.y());
@@ -26,10 +22,8 @@ TEST(PrintedDocumentTest, GetCenteredPageContentRect) {
   EXPECT_EQ(1100, page_content.height());
 
   // X centered.
-  document = base::MakeRefCounted<PrintedDocument>(
-      std::make_unique<PrintSettings>(), name, 1);
   page_size = gfx::Size(500, 1200);
-  page_content = document->GetCenteredPageContentRect(
+  page_content = PrintedDocument::GetCenteredPageContentRect(
       gfx::Size(1000, 1000), page_size, page_content_rect);
   EXPECT_EQ(250, page_content.x());
   EXPECT_EQ(0, page_content.y());
@@ -37,10 +31,8 @@ TEST(PrintedDocumentTest, GetCenteredPageContentRect) {
   EXPECT_EQ(1100, page_content.height());
 
   // Y centered.
-  document = base::MakeRefCounted<PrintedDocument>(
-      std::make_unique<PrintSettings>(), name, 1);
   page_size = gfx::Size(1200, 500);
-  page_content = document->GetCenteredPageContentRect(
+  page_content = PrintedDocument::GetCenteredPageContentRect(
       gfx::Size(1000, 1000), page_size, page_content_rect);
   EXPECT_EQ(0, page_content.x());
   EXPECT_EQ(250, page_content.y());
@@ -48,10 +40,8 @@ TEST(PrintedDocumentTest, GetCenteredPageContentRect) {
   EXPECT_EQ(1100, page_content.height());
 
   // Both X and Y centered.
-  document = base::MakeRefCounted<PrintedDocument>(
-      std::make_unique<PrintSettings>(), name, 1);
   page_size = gfx::Size(500, 500),
-  page_content = document->GetCenteredPageContentRect(
+  page_content = PrintedDocument::GetCenteredPageContentRect(
       gfx::Size(1000, 1000), page_size, page_content_rect);
   EXPECT_EQ(250, page_content.x());
   EXPECT_EQ(250, page_content.y());