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

BUG=138542
TBR=thakis@chromium.org
NOPRESUBMIT=true

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

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

9 files changed, 16 insertions, 4 deletions

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service.h b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service.h
index 31ab10a..fc89742 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service.h
@@ -7,6 +7,7 @@
 
 #include "base/callback.h"
 #include "base/callback_list.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
index 5242fd6..d088834 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc
@@ -7,10 +7,12 @@
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h
index 520a3cf..c97fb07 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h
@@ -8,7 +8,6 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_stub.h b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_stub.h
index f3597f6..6816e36 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_stub.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_stub.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h"
 #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
index 8c6c64b..2ffea41 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ -133,7 +135,7 @@ class SupervisedUserRegistrationUtilityTest : public ::testing::Test {
   MockChangeProcessor* change_processor_;
 
   // A unique ID for creating "remote" Sync data.
-  int64 sync_data_id_;
+  int64_t sync_data_id_;
 
   // Whether OnSupervisedUserRegistered has been called.
   bool received_callback_;
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
index ffa3940..d196105 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
index 1da90a2..7db5efe 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 
+#include <stddef.h>
+
 #include <set>
 
 #include "base/bind.h"
@@ -12,6 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
index 02f08de..b780e8d 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_observer.h"
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
index c267227..09268db 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_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 <stdint.h>
+
 #include <string>
 
 #include "base/bind.h"
@@ -9,6 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "build/build_config.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
@@ -106,7 +109,7 @@ class SupervisedUserSyncServiceTest : public ::testing::Test {
   MockChangeProcessor* change_processor_;
 
   // A unique ID for creating "remote" Sync data.
-  int64 sync_data_id_;
+  int64_t sync_data_id_;
 };
 
 SupervisedUserSyncServiceTest::SupervisedUserSyncServiceTest()