Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/diagnostics/diagnostics_writer.cc

Index: chrome/browser/diagnostics/diagnostics_writer.cc
diff --git a/chrome/browser/diagnostics/diagnostics_writer.cc b/chrome/browser/diagnostics/diagnostics_writer.cc
index f219812cb3ee7e11e4d7eede35a58f20e64c839c..a55fed695e659ac921d4d97fcbd39714f9b787a4 100644
--- a/chrome/browser/diagnostics/diagnostics_writer.cc
+++ b/chrome/browser/diagnostics/diagnostics_writer.cc
@@ -4,24 +4,25 @@
 
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 
-#include "build/build_config.h"
-
-#if defined(OS_POSIX)
-#include <stdio.h>
-#include <unistd.h>
-#endif
+#include <stdint.h>
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/base/ui_base_paths.h"
 
+#if defined(OS_POSIX)
+#include <stdio.h>
+#include <unistd.h>
+#endif
+
 namespace diagnostics {
 
 // This is a minimalistic interface to wrap the platform console.
@@ -89,8 +90,8 @@ class WinConsole : public SimpleConsole {
 
   // Sets the foreground and background color.
   bool SetColor(Color color) override {
-    uint16 color_combo = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE |
-                         FOREGROUND_INTENSITY;
+    uint16_t color_combo = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE |
+                           FOREGROUND_INTENSITY;
     switch (color) {
       case RED:
         color_combo = FOREGROUND_RED | FOREGROUND_INTENSITY;