Large patch set (159 files total) to cleanup the includes.

- Slightly reduce the size of the generated .lib files ~3%.
- Reduce the number of implicit and explicit atl and windows includes. hooray!
- Help incremental build by reducing the number of unnecessary included files.
- Split some template class in two, one base class for the common code and the specialization that inherits from the base class.


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

3 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/printing/page_overlays.cc b/chrome/browser/printing/page_overlays.cc
index 6f9d8c3..2b99396 100644
--- a/chrome/browser/printing/page_overlays.cc
+++ b/chrome/browser/printing/page_overlays.cc
@@ -29,6 +29,7 @@
 
 #include "chrome/browser/printing/page_overlays.h"
 
+#include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/printing/printed_document.h"
 #include "chrome/browser/printing/printed_page.h"
diff --git a/chrome/browser/printing/page_overlays_unittest.cc b/chrome/browser/printing/page_overlays_unittest.cc
index d15453a..90ac1a2 100644
--- a/chrome/browser/printing/page_overlays_unittest.cc
+++ b/chrome/browser/printing/page_overlays_unittest.cc
@@ -56,7 +56,7 @@ class PagesSource : public printing::PrintedPagesSource {
  public:
   virtual void RenderOnePrintedPage(printing::PrintedDocument* document,
                                     int page_number) {
-    NOTREACHED();
+    EXPECT_FALSE(true);
   }
 
   virtual std::wstring RenderSourceName() {
diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h
index 9b1e50b..70b47df 100644
--- a/chrome/browser/printing/printer_query.h
+++ b/chrome/browser/printing/printer_query.h
@@ -27,9 +27,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef CHROME_BROWSER_PRINTING_PRINTER_QUERY_H__
-#define CHROME_BROWSER_PRINTING_PRINTER_QUERY_H__
+#ifndef CHROME_BROWSER_PRINTING_PRINTER_QUERY_H_
+#define CHROME_BROWSER_PRINTING_PRINTER_QUERY_H_
 
+#include "base/scoped_ptr.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/printing/print_job_worker_owner.h"
 
@@ -119,9 +120,9 @@ class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery>,
   // Task waiting to be executed.
   scoped_ptr<CancelableTask> callback_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PrinterQuery);
+  DISALLOW_COPY_AND_ASSIGN(PrinterQuery);
 };
 
 }  // namespace printing
 
-#endif  // CHROME_BROWSER_PRINTING_PRINTER_QUERY_H__
+#endif  // CHROME_BROWSER_PRINTING_PRINTER_QUERY_H_