Move units to new module printing. Add printing_unittests on Windows too. Make test_shell and chrome_dll dependent on printing.

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

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

12 files changed, 98 insertions, 167 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index b3fbc7f..1d2d6df 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -369,8 +369,6 @@ input_files = ChromeFileList([
     'printing/printed_pages_source.h',
     'printing/printer_query.cc',
     'printing/printer_query.h',
-    'printing/units.cc',
-    'printing/units.h',
     'printing/win_printing_context.cc',
     'printing/win_printing_context.h',
   ]),
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 11070f7..bd61f95 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -410,14 +410,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\process_singleton_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\process_singleton.h"
-				>
-			</File>
-			<File
 				RelativePath=".\meta_table_helper.cc"
 				>
 			</File>
@@ -466,6 +458,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\process_singleton.h"
+				>
+			</File>
+			<File
+				RelativePath=".\process_singleton_win.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\profile.cc"
 				>
 			</File>
@@ -1406,14 +1406,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\printing\units.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\printing\units.h"
-				>
-			</File>
-			<File
 				RelativePath=".\printing\win_printing_context.cc"
 				>
 			</File>
diff --git a/chrome/browser/printing/print_settings.cc b/chrome/browser/printing/print_settings.cc
index e98b06e..6f3f156 100644
--- a/chrome/browser/printing/print_settings.cc
+++ b/chrome/browser/printing/print_settings.cc
@@ -6,8 +6,8 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/logging.h"
-#include "chrome/browser/printing/units.h"
 #include "chrome/common/render_messages.h"
+#include "printing/units.h"
 
 namespace printing {
 
@@ -65,7 +65,8 @@ void PrintSettings::Init(HDC hdc,
                                   GetDeviceCaps(hdc, HORZRES),
                                   GetDeviceCaps(hdc, VERTRES));
   // Hard-code text_height = 0.5cm = ~1/5 of inch
-  page_setup_pixels_.Init(physical_size_pixels, printable_area_pixels,
+  page_setup_pixels_.Init(physical_size_pixels,
+                          printable_area_pixels,
                           ConvertUnit(500, kHundrethsMMPerInch, dpi_));
 
   // Initialize page_setup_cmm_.
@@ -104,16 +105,21 @@ void PrintSettings::UpdateMarginsMetric(const PageMargins& new_margins) {
 
   // Converts the margins in dpi unit and apply those too.
   PageMargins pixels_margins;
-  pixels_margins.header = ConvertUnit(new_margins.header, kHundrethsMMPerInch,
+  pixels_margins.header = ConvertUnit(new_margins.header,
+                                      kHundrethsMMPerInch,
                                       dpi_);
-  pixels_margins.footer = ConvertUnit(new_margins.footer, kHundrethsMMPerInch,
+  pixels_margins.footer = ConvertUnit(new_margins.footer,
+                                      kHundrethsMMPerInch,
                                       dpi_);
-  pixels_margins.left = ConvertUnit(new_margins.left, kHundrethsMMPerInch,
+  pixels_margins.left = ConvertUnit(new_margins.left,
+                                    kHundrethsMMPerInch,
                                     dpi_);
   pixels_margins.top = ConvertUnit(new_margins.top, kHundrethsMMPerInch, dpi_);
-  pixels_margins.right = ConvertUnit(new_margins.right, kHundrethsMMPerInch,
+  pixels_margins.right = ConvertUnit(new_margins.right,
+                                     kHundrethsMMPerInch,
                                      dpi_);
-  pixels_margins.bottom = ConvertUnit(new_margins.bottom, kHundrethsMMPerInch,
+  pixels_margins.bottom = ConvertUnit(new_margins.bottom,
+                                      kHundrethsMMPerInch,
                                       dpi_);
   page_setup_pixels_.SetRequestedMargins(pixels_margins);
 }
diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index 21535b2..589085b 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -12,13 +12,13 @@
 #include "chrome/browser/printing/page_overlays.h"
 #include "chrome/browser/printing/printed_pages_source.h"
 #include "chrome/browser/printing/printed_page.h"
-#include "chrome/browser/printing/units.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
+#include "printing/units.h"
 #include "skia/ext/platform_device.h"
 
 using base::Time;
diff --git a/chrome/browser/printing/units.cc b/chrome/browser/printing/units.cc
deleted file mode 100644
index 9d48676..0000000
--- a/chrome/browser/printing/units.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2006-2008 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 "chrome/browser/printing/units.h"
-
-#include "base/logging.h"
-
-namespace printing {
-
-int ConvertUnit(int value, int old_unit, int new_unit) {
-  DCHECK_GT(new_unit, 0);
-  DCHECK_GT(old_unit, 0);
-  // With integer arithmetic, to divide a value with correct rounding, you need
-  // to add half of the divisor value to the dividend value. You need to do the
-  // reverse with negative number.
-  if (value >= 0) {
-    return ((value * new_unit) + (old_unit / 2)) / old_unit;
-  } else {
-    return ((value * new_unit) - (old_unit / 2)) / old_unit;
-  }
-}
-
-double ConvertUnitDouble(double value, double old_unit, double new_unit) {
-  DCHECK_GT(new_unit, 0);
-  DCHECK_GT(old_unit, 0);
-  return value * new_unit / old_unit;
-}
-
-int ConvertMilliInchToHundredThousanthMeter(int milli_inch) {
-  // 1" == 25.4 mm
-  // 1" == 25400 um
-  // 0.001" == 25.4 um
-  // 0.001" == 2.54 cmm
-  return ConvertUnit(milli_inch, 100, 254);
-}
-
-int ConvertHundredThousanthMeterToMilliInch(int cmm) {
-  return ConvertUnit(cmm, 254, 100);
-}
-
-}  // namespace printing
-
diff --git a/chrome/browser/printing/units.h b/chrome/browser/printing/units.h
deleted file mode 100644
index aad3795..0000000
--- a/chrome/browser/printing/units.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef CHROME_BROWSER_PRINTING_UNITS_H__
-#define CHROME_BROWSER_PRINTING_UNITS_H__
-
-namespace printing {
-
-// Length of a thousanth of inches in 0.01mm unit.
-const int kHundrethsMMPerInch = 2540;
-
-// Converts from one unit system to another using integer arithmetics.
-int ConvertUnit(int value, int old_unit, int new_unit);
-
-// Converts from one unit system to another using doubles.
-double ConvertUnitDouble(double value, double old_unit, double new_unit);
-
-// Converts from 0.001 inch unit to 0.00001 meter.
-int ConvertMilliInchToHundredThousanthMeter(int milli_inch);
-
-// Converts from 0.00001 meter unit to 0.001 inch.
-int ConvertHundredThousanthMeterToMilliInch(int cmm);
-
-}  // namespace printing
-
-#endif  // CHROME_BROWSER_PRINTING_UNITS_H__
-
diff --git a/chrome/browser/printing/units_unittest.cc b/chrome/browser/printing/units_unittest.cc
deleted file mode 100644
index ff85cb6..0000000
--- a/chrome/browser/printing/units_unittest.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2006-2008 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 "chrome/browser/printing/units.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gtest/include/gtest/gtest-spi.h"
-
-using namespace printing;
-
-TEST(UnitsTest, Convertions) {
-  EXPECT_EQ(100, ConvertUnit(100, 100, 100));
-  EXPECT_EQ(-100, ConvertUnit(-100, 100, 100));
-  EXPECT_EQ(0, ConvertUnit(0, 100, 100));
-  EXPECT_EQ(99, ConvertUnit(99, 100, 100));
-  EXPECT_EQ(101, ConvertUnit(101, 100, 100));
-  EXPECT_EQ(99900, ConvertUnit(999, 10, 1000));
-  EXPECT_EQ(100100, ConvertUnit(1001, 10, 1000));
-
-  // Rounding.
-  EXPECT_EQ(10, ConvertUnit(999, 1000, 10));
-  EXPECT_EQ(10, ConvertUnit(950, 1000, 10));
-  EXPECT_EQ(9, ConvertUnit(949, 1000, 10));
-  EXPECT_EQ(10, ConvertUnit(1001, 1000, 10));
-  EXPECT_EQ(10, ConvertUnit(1049, 1000, 10));
-  EXPECT_EQ(11, ConvertUnit(1050, 1000, 10));
-  EXPECT_EQ(-10, ConvertUnit(-999, 1000, 10));
-  EXPECT_EQ(-10, ConvertUnit(-950, 1000, 10));
-  EXPECT_EQ(-9, ConvertUnit(-949, 1000, 10));
-  EXPECT_EQ(-10, ConvertUnit(-1001, 1000, 10));
-  EXPECT_EQ(-10, ConvertUnit(-1049, 1000, 10));
-  EXPECT_EQ(-11, ConvertUnit(-1050, 1000, 10));
-
-  EXPECT_EQ(0, ConvertUnit(2, 1000000000, 1));
-  EXPECT_EQ(2000000000, ConvertUnit(2, 1, 1000000000));
-  EXPECT_EQ(4000000000U,
-            static_cast<unsigned int>(ConvertUnit(2, 1, 2000000000)));
-
-  EXPECT_EQ(100, ConvertUnitDouble(100, 100, 100));
-  EXPECT_EQ(-100, ConvertUnitDouble(-100, 100, 100));
-  EXPECT_EQ(0, ConvertUnitDouble(0, 100, 100));
-  EXPECT_EQ(0.000002, ConvertUnitDouble(2, 1000, 0.001));
-  EXPECT_EQ(2000000, ConvertUnitDouble(2, 0.001, 1000));
-
-  EXPECT_EQ(kHundrethsMMPerInch, ConvertMilliInchToHundredThousanthMeter(1000));
-  EXPECT_EQ(-kHundrethsMMPerInch,
-            ConvertMilliInchToHundredThousanthMeter(-1000));
-  EXPECT_EQ(0, ConvertMilliInchToHundredThousanthMeter(0));
-  EXPECT_EQ(1000, ConvertHundredThousanthMeterToMilliInch(kHundrethsMMPerInch));
-  EXPECT_EQ(-1000,
-            ConvertHundredThousanthMeterToMilliInch(-kHundrethsMMPerInch));
-  EXPECT_EQ(0, ConvertHundredThousanthMeterToMilliInch(0));
-}
-
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 97a410f..2648eed 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -291,6 +291,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl
 		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
@@ -338,6 +339,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\too
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
@@ -1992,6 +1994,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress_cache", "..\net\buil
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing", "..\printing\printing.vcproj", "{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing_unittests", "..\printing\printing_unittests.vcproj", "{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -2616,6 +2634,14 @@ Global
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.Build.0 = Release|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2672,6 +2698,14 @@ Global
 		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.ActiveCfg = Release|Win32
 		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.Build.0 = Release|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -3327,6 +3361,7 @@ Global
 		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
@@ -3334,6 +3369,7 @@ Global
 		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
 		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index da00b86..5f58e72 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -178,7 +178,6 @@
 		4D7BFABB0E9D49C1009A6919 /* page_number.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA7F0E9D49A4009A6919 /* page_number.cc */; };
 		4D7BFAC40E9D49C6009A6919 /* page_setup.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA880E9D49A4009A6919 /* page_setup.cc */; };
 		4D7BFAC60E9D49CB009A6919 /* page_range.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA850E9D49A4009A6919 /* page_range.cc */; };
-		4D7BFAC80E9D49D1009A6919 /* units.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA9F0E9D49A4009A6919 /* units.cc */; };
 		4D7BFAEE0E9D49E5009A6919 /* bloom_filter.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFACE0E9D49DE009A6919 /* bloom_filter.cc */; };
 		4D7BFAEF0E9D49E7009A6919 /* chunk_range.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD10E9D49DE009A6919 /* chunk_range.cc */; };
 		4D7BFAF10E9D49EB009A6919 /* protocol_parser.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD80E9D49DE009A6919 /* protocol_parser.cc */; };
@@ -191,7 +190,6 @@
 		4D7BFB510E9D4C3E009A6919 /* dns_host_info_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA6C0E9D4981009A6919 /* dns_host_info_unittest.cc */; };
 		4D7BFB580E9D4C43009A6919 /* page_range_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA870E9D49A4009A6919 /* page_range_unittest.cc */; };
 		4D7BFB5F0E9D4C46009A6919 /* page_setup_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA8A0E9D49A4009A6919 /* page_setup_unittest.cc */; };
-		4D7BFB610E9D4C4B009A6919 /* units_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAA10E9D49A4009A6919 /* units_unittest.cc */; };
 		4D7BFB6D0E9D4C51009A6919 /* bloom_filter_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD00E9D49DE009A6919 /* bloom_filter_unittest.cc */; };
 		4D7BFB710E9D4C55009A6919 /* chunk_range_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD30E9D49DE009A6919 /* chunk_range_unittest.cc */; };
 		4D7BFB780E9D4C5A009A6919 /* protocol_parser_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFADA0E9D49DE009A6919 /* protocol_parser_unittest.cc */; };
@@ -2213,9 +2211,6 @@
 		4D7BFA9C0E9D49A4009A6919 /* printer_query.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printer_query.h; sourceTree = "<group>"; };
 		4D7BFA9D0E9D49A4009A6919 /* printing_layout_uitest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = printing_layout_uitest.cc; sourceTree = "<group>"; };
 		4D7BFA9E0E9D49A4009A6919 /* printing_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printing_test.h; sourceTree = "<group>"; };
-		4D7BFA9F0E9D49A4009A6919 /* units.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = units.cc; sourceTree = "<group>"; };
-		4D7BFAA00E9D49A4009A6919 /* units.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = units.h; sourceTree = "<group>"; };
-		4D7BFAA10E9D49A4009A6919 /* units_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = units_unittest.cc; sourceTree = "<group>"; };
 		4D7BFAA20E9D49A4009A6919 /* win_printing_context.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win_printing_context.cc; sourceTree = "<group>"; };
 		4D7BFAA30E9D49A4009A6919 /* win_printing_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = win_printing_context.h; sourceTree = "<group>"; };
 		4D7BFAA40E9D49A4009A6919 /* win_printing_context_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win_printing_context_unittest.cc; sourceTree = "<group>"; };
@@ -3563,9 +3558,6 @@
 				4D7BFA9C0E9D49A4009A6919 /* printer_query.h */,
 				4D7BFA9D0E9D49A4009A6919 /* printing_layout_uitest.cc */,
 				4D7BFA9E0E9D49A4009A6919 /* printing_test.h */,
-				4D7BFA9F0E9D49A4009A6919 /* units.cc */,
-				4D7BFAA00E9D49A4009A6919 /* units.h */,
-				4D7BFAA10E9D49A4009A6919 /* units_unittest.cc */,
 				4D7BFAA20E9D49A4009A6919 /* win_printing_context.cc */,
 				4D7BFAA30E9D49A4009A6919 /* win_printing_context.h */,
 				4D7BFAA40E9D49A4009A6919 /* win_printing_context_unittest.cc */,
@@ -5562,7 +5554,6 @@
 				4D7BFA320E9D4912009A6919 /* text_database.cc in Sources */,
 				4D7BFA370E9D4915009A6919 /* text_database_manager.cc in Sources */,
 				4D7BFA390E9D4918009A6919 /* thumbnail_database.cc in Sources */,
-				4D7BFAC80E9D49D1009A6919 /* units.cc in Sources */,
 				E4F324600EE5D011002533CE /* url_database.cc in Sources */,
 				8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */,
 				3AEA44DB19C9D93B63D7A2E4 /* url_fetcher_protect.cc in Sources */,
@@ -5650,7 +5641,6 @@
 				544FBC49CB83E458B6B7069D /* test_web_contents.cc in Sources */,
 				826858FA0F326FA3009F6555 /* testing_profile.cc in Sources */,
 				4D7BFB3E0E9D4C2F009A6919 /* text_database_unittest.cc in Sources */,
-				4D7BFB610E9D4C4B009A6919 /* units_unittest.cc in Sources */,
 				A572828F0F31156100384E1B /* unzip_unittest.cc in Sources */,
 				CA8133120F423C710096C1DC /* url_database_unittest.cc in Sources */,
 				8570EB3F140C07ABF1957F12 /* url_pattern_unittest.cc in Sources */,
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index 0994a1c..7731f7a 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -292,6 +292,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl
 		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
@@ -339,6 +340,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\too
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
 		{867F64C9-D631-41A9-B467-13D6378A72AA} = {867F64C9-D631-41A9-B467-13D6378A72AA}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
@@ -1743,6 +1745,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore_prebuild", "..\webk
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing_unittests", "..\printing\printing_unittests.vcproj", "{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing", "..\printing\printing.vcproj", "{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2432,6 +2450,16 @@ Global
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Any CPU.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.Build.0 = Release|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -2492,6 +2520,16 @@ Global
 		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32
 		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Any CPU.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.Build.0 = Release|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -3178,12 +3216,14 @@ Global
 		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
 		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index c8464ca..e02dd66 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -175,7 +175,6 @@ input_files = ChromeFileList([
     '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
     '$CHROME_DIR/browser/history/text_database_unittest.cc',
     '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
-    '$CHROME_DIR/browser/printing/units_unittest.cc',
     '$CHROME_DIR/browser/history/url_database_unittest.cc',
     '$CHROME_DIR/browser/net/resolve_proxy_msg_helper_unittest.cc',
     '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
@@ -326,7 +325,6 @@ if env.Bit('mac'):
       '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
       '$CHROME_DIR/browser/printing/page_range_unittest.cc',
       '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
-      '$CHROME_DIR/browser/printing/units_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 6c58075..e6ba858 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -695,10 +695,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\browser\printing\units_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\browser\history\url_database_unittest.cc"
 				>
 			</File>