Switch to standard integer types in components/, part 4 of 4.

BUG=138542
TBR=blundell@chromium.org

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

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

11 files changed, 16 insertions, 5 deletions

diff --git a/components/user_manager/empty_user_info.h b/components/user_manager/empty_user_info.h
index 5fb41c9..b99e4bb 100644
--- a/components/user_manager/empty_user_info.h
+++ b/components/user_manager/empty_user_info.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager_export.h"
diff --git a/components/user_manager/fake_user_manager.h b/components/user_manager/fake_user_manager.h
index 77f1649..c85bcde 100644
--- a/components/user_manager/fake_user_manager.h
+++ b/components/user_manager/fake_user_manager.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
diff --git a/components/user_manager/known_user.cc b/components/user_manager/known_user.cc
index d78dff7..aa28fa7 100644
--- a/components/user_manager/known_user.cc
+++ b/components/user_manager/known_user.cc
@@ -4,6 +4,8 @@
 
 #include "components/user_manager/known_user.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
diff --git a/components/user_manager/user.cc b/components/user_manager/user.cc
index 3ead416..a76546c 100644
--- a/components/user_manager/user.cc
+++ b/components/user_manager/user.cc
@@ -4,7 +4,10 @@
 
 #include "components/user_manager/user.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 71d7016..b4e1198 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_image/user_image.h"
diff --git a/components/user_manager/user_image/default_user_images.cc b/components/user_manager/user_image/default_user_images.cc
index 58ceacb..fd4118b 100644
--- a/components/user_manager/user_image/default_user_images.cc
+++ b/components/user_manager/user_image/default_user_images.cc
@@ -4,8 +4,8 @@
 
 #include "components/user_manager/user_image/default_user_images.h"
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
diff --git a/components/user_manager/user_image/default_user_images.h b/components/user_manager/user_image/default_user_images.h
index 34bc8bc..6a1cc4c 100644
--- a/components/user_manager/user_image/default_user_images.h
+++ b/components/user_manager/user_image/default_user_images.h
@@ -5,7 +5,8 @@
 #ifndef COMPONENTS_USER_MANAGER_USER_IMAGE_DEFAULT_USER_IMAGES_H_
 #define COMPONENTS_USER_MANAGER_USER_IMAGE_DEFAULT_USER_IMAGES_H_
 
-#include <cstddef>  // for size_t
+#include <stddef.h>
+
 #include <string>
 
 #include "base/strings/string16.h"
diff --git a/components/user_manager/user_info_impl.h b/components/user_manager/user_info_impl.h
index d2733eb..a22c576 100644
--- a/components/user_manager/user_info_impl.h
+++ b/components/user_manager/user_info_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
diff --git a/components/user_manager/user_manager.h b/components/user_manager/user_manager.h
index d614086..55245ad 100644
--- a/components/user_manager/user_manager.h
+++ b/components/user_manager/user_manager.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager_export.h"
 #include "components/user_manager/user_type.h"
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index 7c8e865..312aca1 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -4,7 +4,8 @@
 
 #include "components/user_manager/user_manager_base.h"
 
-#include <cstddef>
+#include <stddef.h>
+
 #include <set>
 
 #include "base/bind.h"
diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index 83dc076..d97d5cb 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"