commit 047470cd5b1f4b24ba923b2f533ef9109d0c2664
author tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Sep 27 20:05:30 2011
committer tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Sep 27 20:05:30 2011
tree 0ea08ab0b2b46f3056bd52705df06c47301f8620
parent a8f55faf9b2e44faf5c6d8e7b3ee46feeaf4002f

ui/gfx: Add ToString() function to Size class.

So we don't need to override operator<< for Size class.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/8038024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102998 0039d316-1c4b-4281-b951-d872f2087c98

printing/page_setup_unittest.cc

diff --git a/printing/page_setup_unittest.cc b/printing/page_setup_unittest.cc
index e2c68b91..be0e4b6 100644
--- a/printing/page_setup_unittest.cc
+++ b/printing/page_setup_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -67,25 +67,31 @@
                              effective_margins.top);
 
   // Test values.
-  EXPECT_EQ(page_size, setup.physical_size()) << seed << " " << page_size <<
-      " " << printable_area << " " << kTextHeight;
-  EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " << page_size <<
-      " " << printable_area << " " << kTextHeight;
-  EXPECT_EQ(content_area, setup.content_area()) << seed << " " << page_size <<
-      " " << printable_area << " " << kTextHeight;
+  EXPECT_EQ(page_size, setup.physical_size()) << seed << " " <<
+      page_size.ToString() << " " << printable_area << " " << kTextHeight;
+  EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " <<
+      page_size.ToString() << " " << printable_area << " " << kTextHeight;
+  EXPECT_EQ(content_area, setup.content_area()) << seed << " " <<
+      page_size.ToString() << " " << printable_area << " " << kTextHeight;
 
   EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
-      seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+      seed << " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
-      seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+      seed << " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.left, setup.effective_margins().left) << seed <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.top, setup.effective_margins().top) << seed <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.right, setup.effective_margins().right) << seed <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
-      seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+      seed << " " << page_size.ToString() << " " << printable_area <<
+       " " << kTextHeight;
 }
 
 TEST(PageSetupTest, HardCoded) {
@@ -124,23 +130,29 @@
   gfx::Rect content_area(4, 6, 92, 88);
 
   // Test values.
-  EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size <<
+  EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size.ToString() <<
       " " << printable_area << " " << kTextHeight;
-  EXPECT_EQ(overlay_area, setup.overlay_area()) << " " << page_size <<
-      " " << printable_area << " " << kTextHeight;
-  EXPECT_EQ(content_area, setup.content_area()) << " " << page_size <<
-      " " << printable_area << " " << kTextHeight;
+  EXPECT_EQ(overlay_area, setup.overlay_area()) << " " <<
+      page_size.ToString() <<  " " << printable_area << " " << kTextHeight;
+  EXPECT_EQ(content_area, setup.content_area()) << " " <<
+      page_size.ToString() <<  " " << printable_area << " " << kTextHeight;
 
   EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " <<
+      printable_area << " " << kTextHeight;
   EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.left, setup.effective_margins().left) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.top, setup.effective_margins().top) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.right, setup.effective_margins().right) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
   EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
-      " " << page_size << " " << printable_area << " " << kTextHeight;
+      " " << page_size.ToString() << " " << printable_area <<
+      " " << kTextHeight;
 }