Build a bunch more of chrome/ on Linux.

Patch from Pawel Hajdan Jr.

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

3 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/printing/page_number.h b/chrome/browser/printing/page_number.h
index 6042869..2782824 100644
--- a/chrome/browser/printing/page_number.h
+++ b/chrome/browser/printing/page_number.h
@@ -5,9 +5,7 @@
 #ifndef CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__
 #define CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__
 
-#ifdef _DEBUG
 #include <ostream>
-#endif
 
 #include "chrome/browser/printing/page_range.h"
 
@@ -65,8 +63,8 @@ class PageNumber {
 
 // Debug output support.
 template<class E, class T>
-inline std::basic_ostream<E,T>& operator<<(std::basic_ostream<E,T>& ss,
-                                           const PageNumber& page) {
+inline typename std::basic_ostream<E,T>& operator<<(
+    typename std::basic_ostream<E,T>& ss, const PageNumber& page) {
   return ss << page.ToInt();
 }
 
diff --git a/chrome/browser/printing/page_range_unittest.cc b/chrome/browser/printing/page_range_unittest.cc
index ca404d8..d7a8d3f 100644
--- a/chrome/browser/printing/page_range_unittest.cc
+++ b/chrome/browser/printing/page_range_unittest.cc
@@ -18,7 +18,7 @@ TEST(PageRangeTest, RangeMerge) {
   range.to = 5;
   ranges.push_back(range);
   std::vector<int> pages(printing::PageRange::GetPages(ranges));
-  ASSERT_EQ(8, pages.size());
+  ASSERT_EQ(8U, pages.size());
   EXPECT_EQ(1, pages[0]);
   EXPECT_EQ(2, pages[1]);
   EXPECT_EQ(3, pages[2]);
@@ -32,6 +32,6 @@ TEST(PageRangeTest, RangeMerge) {
 TEST(PageRangeTest, Empty) {
   printing::PageRanges ranges;
   std::vector<int> pages(printing::PageRange::GetPages(ranges));
-  EXPECT_EQ(0, pages.size());
+  EXPECT_EQ(0U, pages.size());
 }
 
diff --git a/chrome/browser/printing/units_unittest.cc b/chrome/browser/printing/units_unittest.cc
index 1adc931..ff85cb6 100644
--- a/chrome/browser/printing/units_unittest.cc
+++ b/chrome/browser/printing/units_unittest.cc
@@ -33,7 +33,8 @@ TEST(UnitsTest, Convertions) {
 
   EXPECT_EQ(0, ConvertUnit(2, 1000000000, 1));
   EXPECT_EQ(2000000000, ConvertUnit(2, 1, 1000000000));
-  EXPECT_EQ(4000000000, ConvertUnit(2, 1, 2000000000));
+  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));