Switch to standard integer types in printing/.

BUG=138542
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1544623002

Cr-Commit-Position: refs/heads/master@{#366463}

45 files changed, 91 insertions, 26 deletions

diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index 79e33fc..dbc6c5f 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -5,6 +5,7 @@
 #include "printing/backend/cups_helper.h"
 
 #include <cups/ppd.h>
+#include <stddef.h>
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
index 917078b..43ede89 100644
--- a/printing/backend/print_backend_dummy.cc
+++ b/printing/backend/print_backend_dummy.cc
@@ -9,6 +9,7 @@
 #include "printing/backend/print_backend.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/values.h"
 
 namespace printing {
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index fa697b4..f53f55d 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -5,6 +5,7 @@
 #include "printing/backend/print_backend.h"
 
 #include <objidl.h>
+#include <stddef.h>
 #include <winspool.h>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/printing/backend/printing_info_win.cc b/printing/backend/printing_info_win.cc
index e759639..d5b37ca 100644
--- a/printing/backend/printing_info_win.cc
+++ b/printing/backend/printing_info_win.cc
@@ -4,19 +4,21 @@
 
 #include "printing/backend/printing_info_win.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 
 namespace printing {
 
 namespace internal {
 
-uint8* GetDriverInfo(HANDLE printer, int level) {
+uint8_t* GetDriverInfo(HANDLE printer, int level) {
   DWORD size = 0;
   ::GetPrinterDriver(printer, NULL, level, NULL, 0, &size);
   if (size == 0) {
     return NULL;
   }
-  scoped_ptr<uint8[]> buffer(new uint8[size]);
+  scoped_ptr<uint8_t[]> buffer(new uint8_t[size]);
   memset(buffer.get(), 0, size);
   if (!::GetPrinterDriver(printer, NULL, level, buffer.get(), size, &size)) {
     return NULL;
@@ -24,7 +26,7 @@ uint8* GetDriverInfo(HANDLE printer, int level) {
   return buffer.release();
 }
 
-uint8* GetPrinterInfo(HANDLE printer, int level) {
+uint8_t* GetPrinterInfo(HANDLE printer, int level) {
   DWORD size = 0;
   ::GetPrinter(printer, level, NULL, 0, &size);
   if (size == 0) {
@@ -32,7 +34,7 @@ uint8* GetPrinterInfo(HANDLE printer, int level) {
                     ", error = " << GetLastError();
     return NULL;
   }
-  scoped_ptr<uint8[]> buffer(new uint8[size]);
+  scoped_ptr<uint8_t[]> buffer(new uint8_t[size]);
   memset(buffer.get(), 0, size);
   if (!::GetPrinter(printer, level, buffer.get(), size, &size)) {
     LOG(WARNING) << "Failed to get PRINTER_INFO_" << level <<
diff --git a/printing/backend/printing_info_win.h b/printing/backend/printing_info_win.h
index 1134194..c91d837 100644
--- a/printing/backend/printing_info_win.h
+++ b/printing/backend/printing_info_win.h
@@ -6,6 +6,7 @@
 #define PRINTING_BACKEND_PRINTING_INFO_WIN_H_
 
 #include <objidl.h>
+#include <stdint.h>
 #include <winspool.h>
 
 #include "base/memory/scoped_ptr.h"
@@ -15,8 +16,8 @@ namespace printing {
 
 namespace internal {
 
-PRINTING_EXPORT uint8* GetDriverInfo(HANDLE printer, int level);
-PRINTING_EXPORT uint8* GetPrinterInfo(HANDLE printer, int level);
+PRINTING_EXPORT uint8_t* GetDriverInfo(HANDLE printer, int level);
+PRINTING_EXPORT uint8_t* GetPrinterInfo(HANDLE printer, int level);
 
 // This class is designed to work with PRINTER_INFO_X structures
 // and calls GetPrinter internally with correctly allocated buffer.
@@ -33,7 +34,7 @@ class PrinterInfo {
   }
 
  private:
-  scoped_ptr<uint8[]> buffer_;
+  scoped_ptr<uint8_t[]> buffer_;
 };
 
 // This class is designed to work with DRIVER_INFO_X structures
@@ -51,7 +52,7 @@ class DriverInfo {
   }
 
  private:
-  scoped_ptr<uint8[]> buffer_;
+  scoped_ptr<uint8_t[]> buffer_;
 };
 
 }  // namespace internal
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index ac74547..ef775e4 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -4,11 +4,14 @@
 
 #include "printing/backend/win_helper.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/file_version_info.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
index fb7d20c..d79e602 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -12,6 +12,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/win/scoped_handle.h"
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 4b00bca..3d54384 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -4,9 +4,12 @@
 
 #include "printing/emf_win.h"
 
+#include <stdint.h>
+
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
diff --git a/printing/emf_win.h b/printing/emf_win.h
index 359d4b3..da14f1c 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -6,12 +6,14 @@
 #define PRINTING_EMF_WIN_H_
 
 #include <windows.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "printing/metafile.h"
 
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index f6ea72a..316defc 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -5,12 +5,12 @@
 #include "printing/emf_win.h"
 
 // For quick access.
+#include <stdint.h>
 #include <wingdi.h>
 #include <winspool.h>
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
diff --git a/printing/image.cc b/printing/image.cc
index 23f988a..a0376bb 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -4,6 +4,8 @@
 
 #include "printing/image.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/files/file_util.h"
diff --git a/printing/image.h b/printing/image.h
index 1406a85..f083232 100644
--- a/printing/image.h
+++ b/printing/image.h
@@ -5,10 +5,12 @@
 #ifndef PRINTING_IMAGE_H_
 #define PRINTING_IMAGE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "printing/printing_export.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/printing/image_mac.cc b/printing/image_mac.cc
index 864a150..423b1fc 100644
--- a/printing/image_mac.cc
+++ b/printing/image_mac.cc
@@ -5,6 +5,8 @@
 #include "printing/image.h"
 
 #include <ApplicationServices/ApplicationServices.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "printing/metafile.h"
diff --git a/printing/image_win.cc b/printing/image_win.cc
index 1584efb..787c24a 100644
--- a/printing/image_win.cc
+++ b/printing/image_win.cc
@@ -4,6 +4,10 @@
 
 #include "printing/image.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
diff --git a/printing/metafile.cc b/printing/metafile.cc
index 33c84f4..fd2c829 100644
--- a/printing/metafile.cc
+++ b/printing/metafile.cc
@@ -4,6 +4,8 @@
 
 #include "printing/metafile.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/files/file.h"
diff --git a/printing/metafile.h b/printing/metafile.h
index fb40aae..522f898 100644
--- a/printing/metafile.h
+++ b/printing/metafile.h
@@ -5,9 +5,11 @@
 #ifndef PRINTING_METAFILE_H_
 #define PRINTING_METAFILE_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "printing/printing_export.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/printing/page_number.cc b/printing/page_number.cc
index db3861d..19f025f 100644
--- a/printing/page_number.cc
+++ b/printing/page_number.cc
@@ -4,6 +4,8 @@
 
 #include "printing/page_number.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/logging.h"
diff --git a/printing/page_range.cc b/printing/page_range.cc
index ea2e30a..3c050ef 100644
--- a/printing/page_range.cc
+++ b/printing/page_range.cc
@@ -4,6 +4,8 @@
 
 #include "printing/page_range.h"
 
+#include <stddef.h>
+
 #include <set>
 
 namespace {
diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc
index 016e28a..e717c16 100644
--- a/printing/pdf_metafile_cg_mac.cc
+++ b/printing/pdf_metafile_cg_mac.cc
@@ -4,6 +4,8 @@
 
 #include "printing/pdf_metafile_cg_mac.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/files/file_path.h"
diff --git a/printing/pdf_metafile_cg_mac.h b/printing/pdf_metafile_cg_mac.h
index 9e9640c..db6487f 100644
--- a/printing/pdf_metafile_cg_mac.h
+++ b/printing/pdf_metafile_cg_mac.h
@@ -7,9 +7,10 @@
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "printing/metafile.h"
 
diff --git a/printing/pdf_metafile_cg_mac_unittest.cc b/printing/pdf_metafile_cg_mac_unittest.cc
index 2a17227..4b9b38c 100644
--- a/printing/pdf_metafile_cg_mac_unittest.cc
+++ b/printing/pdf_metafile_cg_mac_unittest.cc
@@ -5,6 +5,7 @@
 #include "printing/pdf_metafile_cg_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc
index 1e7a7d1..e68c0cf 100644
--- a/printing/pdf_metafile_skia.cc
+++ b/printing/pdf_metafile_skia.cc
@@ -4,6 +4,9 @@
 
 #include "printing/pdf_metafile_skia.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h
index a315fa9..cd92d618 100644
--- a/printing/pdf_metafile_skia.h
+++ b/printing/pdf_metafile_skia.h
@@ -5,8 +5,10 @@
 #ifndef PRINTING_PDF_METAFILE_SKIA_H_
 #define PRINTING_PDF_METAFILE_SKIA_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "printing/metafile.h"
diff --git a/printing/print_settings_conversion.cc b/printing/print_settings_conversion.cc
index a0c5eac..cd0c059 100644
--- a/printing/print_settings_conversion.cc
+++ b/printing/print_settings_conversion.cc
@@ -4,6 +4,8 @@
 
 #include "printing/print_settings_conversion.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cmath>
 #include <string>
diff --git a/printing/print_settings_conversion.h b/printing/print_settings_conversion.h
index 92e8670..9c4da1e 100644
--- a/printing/print_settings_conversion.h
+++ b/printing/print_settings_conversion.h
@@ -5,7 +5,6 @@
 #ifndef PRINTING_PRINT_SETTINGS_CONVERSION_H_
 #define PRINTING_PRINT_SETTINGS_CONVERSION_H_
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "printing/page_range.h"
 #include "printing/printing_export.h"
diff --git a/printing/print_settings_initializer_mac.cc b/printing/print_settings_initializer_mac.cc
index 926d698..dcb9c97 100644
--- a/printing/print_settings_initializer_mac.cc
+++ b/printing/print_settings_initializer_mac.cc
@@ -4,6 +4,8 @@
 
 #include "printing/print_settings_initializer_mac.h"
 
+#include <stdint.h>
+
 #include "base/strings/sys_string_conversions.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"
diff --git a/printing/print_settings_initializer_mac.h b/printing/print_settings_initializer_mac.h
index bbdd0b1..9356ea0 100644
--- a/printing/print_settings_initializer_mac.h
+++ b/printing/print_settings_initializer_mac.h
@@ -8,6 +8,7 @@
 #import <ApplicationServices/ApplicationServices.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "printing/page_range.h"
 
 namespace printing {
diff --git a/printing/print_settings_initializer_win.h b/printing/print_settings_initializer_win.h
index fcbacc2..515f8e6 100644
--- a/printing/print_settings_initializer_win.h
+++ b/printing/print_settings_initializer_win.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "printing/page_range.h"
 
 typedef struct HDC__* HDC;
diff --git a/printing/printed_document.h b/printing/printed_document.h
index d309cc8..2231e9a 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
diff --git a/printing/printed_page.h b/printing/printed_page.h
index aa94b61..550d992 100644
--- a/printing/printed_page.h
+++ b/printing/printed_page.h
@@ -5,6 +5,7 @@
 #ifndef PRINTING_PRINTED_PAGE_H_
 #define PRINTING_PRINTED_PAGE_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "printing/metafile.h"
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 3d260ef..609f019 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "printing/print_settings.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/printing/printing_context_android.cc b/printing/printing_context_android.cc
index aa9742a..3fabef2 100644
--- a/printing/printing_context_android.cc
+++ b/printing/printing_context_android.cc
@@ -4,6 +4,8 @@
 
 #include "printing/printing_context_android.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/android/jni_android.h"
diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
index 26ebea6..986f349 100644
--- a/printing/printing_context_android.h
+++ b/printing/printing_context_android.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "printing/printing_context.h"
 
 namespace printing {
diff --git a/printing/printing_context_linux.h b/printing/printing_context_linux.h
index 0de512c..71f5cdb 100644
--- a/printing/printing_context_linux.h
+++ b/printing/printing_context_linux.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "printing/printing_context.h"
 
 namespace base {
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index acccff3..0597fd8a 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "printing/print_job_constants.h"
 #include "printing/printing_context.h"
 
diff --git a/printing/printing_context_no_system_dialog.cc b/printing/printing_context_no_system_dialog.cc
index 746232a..ec8aaaf 100644
--- a/printing/printing_context_no_system_dialog.cc
+++ b/printing/printing_context_no_system_dialog.cc
@@ -4,6 +4,7 @@
 
 #include "printing/printing_context_no_system_dialog.h"
 
+#include <stdint.h>
 #include <unicode/ulocdata.h>
 
 #include "base/logging.h"
diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
index 0bbc1ef..79a0ddf 100644
--- a/printing/printing_context_no_system_dialog.h
+++ b/printing/printing_context_no_system_dialog.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "printing/printing_context.h"
 
 namespace base {
diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
index d2e2b05..2e22641 100644
--- a/printing/printing_context_system_dialog_win.cc
+++ b/printing/printing_context_system_dialog_win.cc
@@ -5,6 +5,7 @@
 #include "printing/printing_context_system_dialog_win.h"
 
 #include "base/auto_reset.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "printing/backend/win_helper.h"
 #include "printing/print_settings_initializer_win.h"
diff --git a/printing/printing_context_system_dialog_win.h b/printing/printing_context_system_dialog_win.h
index 39b24ae..75593e5 100644
--- a/printing/printing_context_system_dialog_win.h
+++ b/printing/printing_context_system_dialog_win.h
@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "printing/printing_context_win.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index 68d9153..2d444cc 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "printing/printing_context.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 171d97c..b71442b 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "printing/printing_context_win.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/win/scoped_handle.h"
@@ -115,19 +118,16 @@ class MockPrintingContextWin : public PrintingContextSytemDialogWin {
     DEVNAMES* dev_names = reinterpret_cast<DEVNAMES*>(dev_names_ptr);
     dev_names->wDefault = 1;
     dev_names->wDriverOffset = sizeof(DEVNAMES) / sizeof(wchar_t);
-    memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wDriverOffset,
-           info_2.get()->pDriverName,
-           driver_size);
+    memcpy(reinterpret_cast<uint8_t*>(dev_names_ptr) + dev_names->wDriverOffset,
+           info_2.get()->pDriverName, driver_size);
     dev_names->wDeviceOffset = base::checked_cast<WORD>(
         dev_names->wDriverOffset + driver_size / sizeof(wchar_t));
-    memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wDeviceOffset,
-           info_2.get()->pPrinterName,
-           printer_size);
+    memcpy(reinterpret_cast<uint8_t*>(dev_names_ptr) + dev_names->wDeviceOffset,
+           info_2.get()->pPrinterName, printer_size);
     dev_names->wOutputOffset = base::checked_cast<WORD>(
         dev_names->wDeviceOffset + printer_size / sizeof(wchar_t));
-    memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wOutputOffset,
-           info_2.get()->pPortName,
-           port_size);
+    memcpy(reinterpret_cast<uint8_t*>(dev_names_ptr) + dev_names->wOutputOffset,
+           info_2.get()->pPortName, port_size);
     GlobalUnlock(dev_names_mem.Get());
     dev_names_ptr = NULL;
 
diff --git a/printing/printing_test.h b/printing/printing_test.h
index 35b9169..9bd43d1 100644
--- a/printing/printing_test.h
+++ b/printing/printing_test.h
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 // Disable the whole test case when executing on a computer that has no printer
 // installed.
diff --git a/printing/printing_utils.cc b/printing/printing_utils.cc
index 5f9fd2c..1c8ec03 100644
--- a/printing/printing_utils.cc
+++ b/printing/printing_utils.cc
@@ -4,6 +4,8 @@
 
 #include "printing/printing_utils.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
diff --git a/printing/printing_utils.h b/printing/printing_utils.h
index e307350..b0e1f92 100644
--- a/printing/printing_utils.h
+++ b/printing/printing_utils.h
@@ -5,6 +5,8 @@
 #ifndef PRINTING_PRINTING_UTILS_H_
 #define PRINTING_PRINTING_UTILS_H_
 
+#include <stddef.h>
+
 #include "base/strings/string16.h"
 #include "printing/printing_export.h"
 
diff --git a/printing/printing_utils_unittest.cc b/printing/printing_utils_unittest.cc
index 331451d..1bfba64 100644
--- a/printing/printing_utils_unittest.cc
+++ b/printing/printing_utils_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "base/strings/utf_string_conversions.h"
 #include "printing/printing_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"