Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/printing/page_number.h

 // 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_PAGE_NUMBER_H__
 #define CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__
 
-#ifdef _DEBUG
 #include <ostream>
-#endif
 
 #include "chrome/browser/printing/page_range.h"
 
 namespace printing {
 
 class PrintSettings;
 
 // Represents a page series following the array of page ranges defined in a
 // PrintSettings.
 class PageNumber {
@@ skipping 37 matching lines @@
   // The next page to be printed. -1 when not used. Valid only if
   // document()->settings().range.empty() is false.
   int page_range_index_;
 
   // Number of expected pages in the document. Used when ranges_ is NULL.
   int document_page_count_;
 };
 
 // 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();
 }
 
 }  // namespace printing
 
 #endif  // CHROME_BROWSER_PRINTING_PAGE_NUMBER_H__