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

BUG=138542 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1542413002 Cr-Commit-Position: refs/heads/master@{#366878}
author: avi <avi@chromium.org> 2015-12-25 16:59:18 -0800
committer: Commit bot <commit-bot@chromium.org> 2015-12-26 01:00:22 +0000
commit: e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a (patch)
tree: 478f750ec499a805e00faa000e9353b28e6ff200
parent: 2606292a9f46c507f23d878f22b7359a11c1e123 (diff)
download: chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.zip
chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.gz
chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.bz2
547 files changed, 1347 insertions, 556 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c998275..e8a93a0 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -14,6 +14,7 @@
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/i18n/base_i18n_switches.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/metrics_hashes.h"
 #include "base/metrics/sparse_histogram.h"
@@ -22,6 +23,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "cc/base/switches.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_content_client.h"
diff --git a/chrome/browser/about_flags.h b/chrome/browser/about_flags.h
index 7101135..c7d6a8e 100644
--- a/chrome/browser/about_flags.h
+++ b/chrome/browser/about_flags.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ABOUT_FLAGS_H_
 #define CHROME_BROWSER_ABOUT_FLAGS_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <map>
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 8e0ca4b..416c01f 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/about_flags.h"
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 #include <string>
@@ -16,6 +18,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/flags_ui/feature_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
index 67bdb8f..70906a0 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 
+#include <stddef.h>
+
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/accessibility/browser_accessibility_state_browsertest.cc b/chrome/browser/accessibility/browser_accessibility_state_browsertest.cc
index f75dd00..862446c 100644
--- a/chrome/browser/accessibility/browser_accessibility_state_browsertest.cc
+++ b/chrome/browser/accessibility/browser_accessibility_state_browsertest.cc
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/test/histogram_tester.h"
-#include "content/public/browser/browser_accessibility_state.h"
+#include "build/build_config.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/browser/browser_accessibility_state.h"
 
 namespace content {
 
diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
index 85fe849..fac1617e 100644
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/after_startup_task_utils.h"
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_info.h"
@@ -12,6 +13,7 @@
 #include "base/synchronization/cancellation_flag.h"
 #include "base/task_runner.h"
 #include "base/tracked_objects.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/after_startup_task_utils.h b/chrome/browser/after_startup_task_utils.h
index 8357670..77388dd 100644
--- a/chrome/browser/after_startup_task_utils.h
+++ b/chrome/browser/after_startup_task_utils.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_AFTER_STARTUP_TASK_UTILS_H_
 #define CHROME_BROWSER_AFTER_STARTUP_TASK_UTILS_H_
 
-#include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 
 namespace android {
diff --git a/chrome/browser/android/accessibility/font_size_prefs_android.h b/chrome/browser/android/accessibility/font_size_prefs_android.h
index 4ef5432e..a39bb75 100644
--- a/chrome/browser/android/accessibility/font_size_prefs_android.h
+++ b/chrome/browser/android/accessibility/font_size_prefs_android.h
@@ -7,6 +7,7 @@
 
 #include <jni.h>
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 
 class PrefChangeRegistrar;
diff --git a/chrome/browser/android/background_sync_launcher_android.h b/chrome/browser/android/background_sync_launcher_android.h
index 873b43f..e909906 100644
--- a/chrome/browser/android/background_sync_launcher_android.h
+++ b/chrome/browser/android/background_sync_launcher_android.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_BACKGROUND_SYNC_LAUNCHER_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_BACKGROUND_SYNC_LAUNCHER_ANDROID_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/android/jni_android.h"
diff --git a/chrome/browser/android/banners/app_banner_data_fetcher_android.h b/chrome/browser/android/banners/app_banner_data_fetcher_android.h
index e694d01..db26df0 100644
--- a/chrome/browser/android/banners/app_banner_data_fetcher_android.h
+++ b/chrome/browser/android/banners/app_banner_data_fetcher_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_DATA_FETCHER_ANDROID_H_
 
 #include "base/android/jni_android.h"
+#include "base/macros.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 
 namespace banners {
diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate_android.h b/chrome/browser/android/banners/app_banner_infobar_delegate_android.h
index 110c988..f5160bfb 100644
--- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.h
+++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/android/banners/app_banner_data_fetcher_android.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/android/banners/app_banner_manager_android.h b/chrome/browser/android/banners/app_banner_manager_android.h
index d1c6752..1d60907 100644
--- a/chrome/browser/android/banners/app_banner_manager_android.h
+++ b/chrome/browser/android/banners/app_banner_manager_android.h
@@ -7,6 +7,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/android/banners/app_banner_data_fetcher_android.h"
 #include "chrome/browser/banners/app_banner_debug_log.h"
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index fdd0bd9..93bfbf0 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/containers/stack_container.h"
@@ -589,7 +592,7 @@ jboolean BookmarksBridge::IsFolderVisible(JNIEnv* env,
                                           jint type) {
   if (type == BookmarkType::BOOKMARK_TYPE_NORMAL) {
     const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
-        bookmark_model_, static_cast<int64>(id));
+        bookmark_model_, static_cast<int64_t>(id));
     return node->IsVisible();
   } else if (type == BookmarkType::BOOKMARK_TYPE_PARTNER) {
     const BookmarkNode* node = partner_bookmarks_shim_->GetNodeByID(
@@ -806,7 +809,7 @@ ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark(
   JNIEnv* env = AttachCurrentThread();
 
   const BookmarkNode* parent = GetParentNode(node);
-  int64 parent_id = parent ? parent->id() : -1;
+  int64_t parent_id = parent ? parent->id() : -1;
 
   std::string url;
   if (node->is_url())
@@ -837,11 +840,10 @@ void BookmarksBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node,
 const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, int type) {
   const BookmarkNode* node;
   if (type == BookmarkType::BOOKMARK_TYPE_PARTNER) {
-    node = partner_bookmarks_shim_->GetNodeByID(
-        static_cast<int64>(node_id));
+    node = partner_bookmarks_shim_->GetNodeByID(static_cast<int64_t>(node_id));
   } else {
     node = bookmarks::GetBookmarkNodeByID(bookmark_model_,
-                                          static_cast<int64>(node_id));
+                                          static_cast<int64_t>(node_id));
   }
   return node;
 }
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.h b/chrome/browser/android/bookmarks/bookmarks_bridge.h
index e1c82e8..7d801b1 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.h
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.h
@@ -9,8 +9,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/common/android/bookmark_id.h"
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
index 4417e50..1f87d03 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
@@ -91,7 +91,7 @@ void PrepareAndSetFavicon(JNIEnv* env, jbyte* icon_bytes, int icon_len,
   }
 }
 
-const BookmarkNode* GetNodeByID(const BookmarkNode* parent, int64 id) {
+const BookmarkNode* GetNodeByID(const BookmarkNode* parent, int64_t id) {
   if (parent->id() == id)
     return parent;
   for (int i= 0, child_count = parent->child_count(); i < child_count; ++i) {
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.h b/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
index 04b988d..a89a74b 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.h
@@ -5,7 +5,10 @@
 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_
 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_
 
+#include <stdint.h>
+
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 
@@ -45,7 +48,7 @@ class PartnerBookmarksReader {
 
   // JNI
   scoped_ptr<bookmarks::BookmarkNode> wip_partner_bookmarks_root_;
-  int64 wip_next_available_id_;
+  int64_t wip_next_available_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksReader);
 };
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
index 39234de..c6cd7c5 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
@@ -137,7 +137,7 @@ void PartnerBookmarksShim::RemoveObserver(
   observers_.RemoveObserver(observer);
 }
 
-const BookmarkNode* PartnerBookmarksShim::GetNodeByID(int64 id) const {
+const BookmarkNode* PartnerBookmarksShim::GetNodeByID(int64_t id) const {
   DCHECK(IsLoaded());
   if (!HasPartnerBookmarks())
     return NULL;
@@ -225,7 +225,8 @@ PartnerBookmarksShim::~PartnerBookmarksShim() {
 }
 
 const BookmarkNode* PartnerBookmarksShim::GetNodeByID(
-    const BookmarkNode* parent, int64 id) const {
+    const BookmarkNode* parent,
+    int64_t id) const {
   if (parent->id() == id)
     return parent;
   for (int i = 0, child_count = parent->child_count(); i < child_count; ++i) {
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
index bc78106..b5cd93e 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
@@ -5,7 +5,10 @@
 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_
 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_
 
+#include <stdint.h>
+
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/supports_user_data.h"
@@ -83,7 +86,7 @@ class PartnerBookmarksShim : public base::SupportsUserData::Data {
   void RemoveObserver(Observer* observer);
 
   // PartnerBookmarksShim versions of BookmarkModel/BookmarkNode methods
-  const bookmarks::BookmarkNode* GetNodeByID(int64 id) const;
+  const bookmarks::BookmarkNode* GetNodeByID(int64_t id) const;
   base::string16 GetTitle(const bookmarks::BookmarkNode* node) const;
 
   bool IsPartnerBookmark(const bookmarks::BookmarkNode* node) const;
@@ -126,7 +129,7 @@ class PartnerBookmarksShim : public base::SupportsUserData::Data {
 
   const bookmarks::BookmarkNode* GetNodeByID(
       const bookmarks::BookmarkNode* parent,
-      int64 id) const;
+      int64_t id) const;
   void ReloadNodeMapping();
   void SaveNodeMapping();
 
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index 0a2eab4..a5d286f 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -126,7 +129,7 @@ TEST_F(PartnerBookmarksShimTest, ObserverNotifiedOfLoadNoPartnerBookmarks) {
 
 TEST_F(PartnerBookmarksShimTest, ObserverNotifiedOfLoadWithPartnerBookmarks) {
   EXPECT_CALL(observer_, PartnerShimLoaded(_)).Times(0);
-  int64 id = 5;
+  int64_t id = 5;
   BookmarkNode* root_partner_node = new BookmarkPermanentNode(id++);
   BookmarkNode* partner_bookmark1 = new BookmarkNode(id++,
                                                      GURL("http://www.a.com"));
diff --git a/chrome/browser/android/bottombar/overlay_panel_content.h b/chrome/browser/android/bottombar/overlay_panel_content.h
index fa588f7..b25a1ba 100644
--- a/chrome/browser/android/bottombar/overlay_panel_content.h
+++ b/chrome/browser/android/bottombar/overlay_panel_content.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_BOTTOMBAR_OVERLAY_PANEL_CONTENT_H_
 
 #include "base/android/jni_android.h"
+#include "base/macros.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 
diff --git a/chrome/browser/android/chrome_application.h b/chrome/browser/android/chrome_application.h
index 2352d41..bfb3623 100644
--- a/chrome/browser/android/chrome_application.h
+++ b/chrome/browser/android/chrome_application.h
@@ -7,7 +7,7 @@
 
 #include <jni.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace content {
 class WebContents;
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index 35a046c..e7bfe271 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/android/chrome_feature_list.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
+#include "base/macros.h"
 #include "jni/ChromeFeatureList_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 378ac4b..b84afe7 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -6,6 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/after_startup_task_utils_android.h"
 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
diff --git a/chrome/browser/android/chrome_media_client_android.h b/chrome/browser/android/chrome_media_client_android.h
index d489e42..fb7c027 100644
--- a/chrome/browser/android/chrome_media_client_android.h
+++ b/chrome/browser/android/chrome_media_client_android.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_CHROME_MEDIA_CLIENT_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_CHROME_MEDIA_CLIENT_ANDROID_H_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "components/cdm/browser/widevine_drm_delegate_android.h"
 #include "media/base/android/media_client_android.h"
diff --git a/chrome/browser/android/chrome_sync_shell_main_delegate.h b/chrome/browser/android/chrome_sync_shell_main_delegate.h
index f786fc7..dbbc571 100644
--- a/chrome/browser/android/chrome_sync_shell_main_delegate.h
+++ b/chrome/browser/android/chrome_sync_shell_main_delegate.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_
 
+#include "base/macros.h"
 #include "chrome/app/android/chrome_main_delegate_android.h"
 
 class ChromeSyncShellMainDelegate : public ChromeMainDelegateAndroid {
diff --git a/chrome/browser/android/compositor/compositor_view.h b/chrome/browser/android/compositor/compositor_view.h
index 4edb26d..1b3fbdb 100644
--- a/chrome/browser/android/compositor/compositor_view.h
+++ b/chrome/browser/android/compositor/compositor_view.h
@@ -10,6 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/resources/ui_resource_client.h"
diff --git a/chrome/browser/android/compositor/layer/content_layer.h b/chrome/browser/android/compositor/layer/content_layer.h
index 59cdf08..eb2d70a 100644
--- a/chrome/browser/android/compositor/layer/content_layer.h
+++ b/chrome/browser/android/compositor/layer/content_layer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/output/filter_operations.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.h b/chrome/browser/android/compositor/layer/contextual_search_layer.h
index 83ce9eb..3ac3c91 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.h
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
 
diff --git a/chrome/browser/android/compositor/layer/layer.h b/chrome/browser/android/compositor/layer/layer.h
index 5bbbede..218463e 100644
--- a/chrome/browser/android/compositor/layer/layer.h
+++ b/chrome/browser/android/compositor/layer/layer.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_LAYER_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer.h"
diff --git a/chrome/browser/android/compositor/layer/tab_handle_layer.h b/chrome/browser/android/compositor/layer/tab_handle_layer.h
index 10ad48c..f7ed055 100644
--- a/chrome/browser/android/compositor/layer/tab_handle_layer.h
+++ b/chrome/browser/android/compositor/layer/tab_handle_layer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TAB_HANDLE_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TAB_HANDLE_LAYER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
diff --git a/chrome/browser/android/compositor/layer/tab_layer.h b/chrome/browser/android/compositor/layer/tab_layer.h
index 81d59e2..da342c9 100644
--- a/chrome/browser/android/compositor/layer/tab_layer.h
+++ b/chrome/browser/android/compositor/layer/tab_layer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TAB_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TAB_LAYER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
 
diff --git a/chrome/browser/android/compositor/layer/thumbnail_layer.h b/chrome/browser/android/compositor/layer/thumbnail_layer.h
index 0da3e4e..96745c8 100644
--- a/chrome/browser/android/compositor/layer/thumbnail_layer.h
+++ b/chrome/browser/android/compositor/layer/thumbnail_layer.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_THUMBNAIL_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_THUMBNAIL_LAYER_H_
 
+#include <stddef.h>
+
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/layers/ui_resource_layer.h"
diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.h b/chrome/browser/android/compositor/layer/toolbar_layer.h
index 5da318e..95abfe6 100644
--- a/chrome/browser/android/compositor/layer/toolbar_layer.h
+++ b/chrome/browser/android/compositor/layer/toolbar_layer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/nine_patch_layer.h"
diff --git a/chrome/browser/android/compositor/layer_title_cache.h b/chrome/browser/android/compositor/layer_title_cache.h
index b75f6fc..722924f 100644
--- a/chrome/browser/android/compositor/layer_title_cache.h
+++ b/chrome/browser/android/compositor/layer_title_cache.h
@@ -11,6 +11,7 @@
 #include "base/android/jni_weak_ref.h"
 #include "base/bind.h"
 #include "base/id_map.h"
+#include "base/macros.h"
 #include "cc/resources/ui_resource_client.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
index 1e9e068..e43b569 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
@@ -10,7 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
 
diff --git a/chrome/browser/android/compositor/scene_layer/scene_layer.h b/chrome/browser/android/compositor/scene_layer/scene_layer.h
index d73c08b..a1f537d 100644
--- a/chrome/browser/android/compositor/scene_layer/scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/scene_layer.h
@@ -9,7 +9,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/layers/layer.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
index b26c37a..c81efe0 100644
--- a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
@@ -9,7 +9,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
diff --git a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
index 1cfbdf8d..a49cde8 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
@@ -10,7 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
index 50d63f7..63fbd97 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
@@ -10,7 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/ui_resource_layer.h"
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index e6e7c17..6fda086 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -5,12 +5,14 @@
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 
 #include <android/bitmap.h>
+#include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h"
 #include "chrome/browser/android/tab_android.h"
diff --git a/chrome/browser/android/compositor/tab_content_manager.h b/chrome/browser/android/compositor/tab_content_manager.h
index ac7bc73..9c2f151 100644
--- a/chrome/browser/android/compositor/tab_content_manager.h
+++ b/chrome/browser/android/compositor/tab_content_manager.h
@@ -11,6 +11,7 @@
 #include "base/android/jni_weak_ref.h"
 #include "base/containers/hash_tables.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "chrome/browser/android/thumbnail/thumbnail_cache.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.h b/chrome/browser/android/contextualsearch/contextual_search_context.h
index d6e6c46..325ec6d 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_context.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_context.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "url/gurl.h"
 
 // Encapsulates key parts of a Contextual Search Context, including surrounding
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.h b/chrome/browser/android/contextualsearch/contextual_search_delegate.h
index e6fdc78..9208f80f 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
index 7f70696..a22c4cd 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.h b/chrome/browser/android/contextualsearch/contextual_search_manager.h
index 398840f..3df2d51 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_manager.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.h
@@ -5,7 +5,10 @@
 #ifndef CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_
 #define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_
 
+#include <stddef.h>
+
 #include "base/android/jni_android.h"
+#include "base/macros.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
index 6a15e1c..24e785b 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/android/contextualsearch/resolved_search_term.h b/chrome/browser/android/contextualsearch/resolved_search_term.h
index 042a37a..5760482 100644
--- a/chrome/browser/android/contextualsearch/resolved_search_term.h
+++ b/chrome/browser/android/contextualsearch/resolved_search_term.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 // Encapsulates the various parts of a Resolved Search Term, which tells
 // Contextual Search what to search for and how that term appears in the
diff --git a/chrome/browser/android/cookies/cookies_fetcher.cc b/chrome/browser/android/cookies/cookies_fetcher.cc
index 80eeb21..c98ad30 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.cc
+++ b/chrome/browser/android/cookies/cookies_fetcher.cc
@@ -105,9 +105,9 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env,
                                     const JavaParamRef<jstring>& value,
                                     const JavaParamRef<jstring>& domain,
                                     const JavaParamRef<jstring>& path,
-                                    int64 creation,
-                                    int64 expiration,
-                                    int64 last_access,
+                                    int64_t creation,
+                                    int64_t expiration,
+                                    int64_t last_access,
                                     bool secure,
                                     bool httponly,
                                     bool firstpartyonly,
diff --git a/chrome/browser/android/cookies/cookies_fetcher.h b/chrome/browser/android/cookies/cookies_fetcher.h
index 16ad9d8..32cf204 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.h
+++ b/chrome/browser/android/cookies/cookies_fetcher.h
@@ -5,9 +5,11 @@
 #ifndef CHROME_BROWSER_ANDROID_COOKIES_COOKIES_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_COOKIES_COOKIES_FETCHER_H_
 
+#include <stdint.h>
+
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ -43,9 +45,9 @@ class CookiesFetcher {
                       const base::android::JavaParamRef<jstring>& value,
                       const base::android::JavaParamRef<jstring>& domain,
                       const base::android::JavaParamRef<jstring>& path,
-                      int64 creation,
-                      int64 expiration,
-                      int64 last_access,
+                      int64_t creation,
+                      int64_t expiration,
+                      int64_t last_access,
                       bool secure,
                       bool httponly,
                       bool firstpartyonly,
diff --git a/chrome/browser/android/data_usage/data_use_matcher.cc b/chrome/browser/android/data_usage/data_use_matcher.cc
index 28073a0..6eb7d92 100644
--- a/chrome/browser/android/data_usage/data_use_matcher.cc
+++ b/chrome/browser/android/data_usage/data_use_matcher.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/data_usage/data_use_matcher.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/android/data_usage/data_use_matcher_unittest.cc b/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
index 4a07ad1..759a23c 100644
--- a/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
+++ b/chrome/browser/android/data_usage/data_use_matcher_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/data_usage/data_use_matcher.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chrome/browser/android/data_usage/data_use_tab_model.cc b/chrome/browser/android/data_usage/data_use_tab_model.cc
index 7eb5868..8aae40ab 100644
--- a/chrome/browser/android/data_usage/data_use_tab_model.cc
+++ b/chrome/browser/android/data_usage/data_use_tab_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/data_usage/data_use_tab_model.h"
 
+#include <stdint.h>
+
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/android/data_usage/data_use_tab_model.h b/chrome/browser/android/data_usage/data_use_tab_model.h
index cc45a67..edacc62 100644
--- a/chrome/browser/android/data_usage/data_use_tab_model.h
+++ b/chrome/browser/android/data_usage/data_use_tab_model.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_DATA_USAGE_DATA_USE_TAB_MODEL_H_
 #define CHROME_BROWSER_ANDROID_DATA_USAGE_DATA_USE_TAB_MODEL_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
index 67d292f..d1a73f4 100644
--- a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
+++ b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/android/data_usage/data_use_ui_tab_model.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
+#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/browser/android/data_usage/data_use_tab_model.h"
diff --git a/chrome/browser/android/data_usage/external_data_use_observer.h b/chrome/browser/android/data_usage/external_data_use_observer.h
index 76584900..ab8cee6 100644
--- a/chrome/browser/android/data_usage/external_data_use_observer.h
+++ b/chrome/browser/android/data_usage/external_data_use_observer.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_DATA_USAGE_EXTERNAL_DATA_USE_OBSERVER_H_
 #define CHROME_BROWSER_ANDROID_DATA_USAGE_EXTERNAL_DATA_USE_OBSERVER_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <string>
diff --git a/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc b/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc
index 5fe2a7b..11b9e28 100644
--- a/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc
+++ b/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/chrome/browser/android/data_usage/tab_data_use_entry_unittest.cc b/chrome/browser/android/data_usage/tab_data_use_entry_unittest.cc
index 8836a8c..e91529e 100644
--- a/chrome/browser/android/data_usage/tab_data_use_entry_unittest.cc
+++ b/chrome/browser/android/data_usage/tab_data_use_entry_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/data_usage/tab_data_use_entry.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <string>
diff --git a/chrome/browser/android/dev_tools_discovery_provider_android.cc b/chrome/browser/android/dev_tools_discovery_provider_android.cc
index aea64f6..73a3c57 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.cc
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/android/dev_tools_discovery_provider_android.h"
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/tab_android.h"
diff --git a/chrome/browser/android/dev_tools_discovery_provider_android.h b/chrome/browser/android/dev_tools_discovery_provider_android.h
index 07e0fe5..341498e 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.h
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_DEV_TOOLS_DISCOVERY_PROVIDER_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_DEV_TOOLS_DISCOVERY_PROVIDER_ANDROID_H_
 
+#include "base/macros.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 
 class DevToolsDiscoveryProviderAndroid :
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index fa440e3..6bde69e 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -9,13 +9,13 @@
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/dev_tools_server.h b/chrome/browser/android/dev_tools_server.h
index 1ada47d..c7f3e96 100644
--- a/chrome/browser/android/dev_tools_server.h
+++ b/chrome/browser/android/dev_tools_server.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_ANDROID_DEV_TOOLS_SERVER_H_
 #define CHROME_BROWSER_ANDROID_DEV_TOOLS_SERVER_H_
 
-#include <string>
 #include <jni.h>
-#include "base/basictypes.h"
+#include <string>
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace devtools_http_handler {
diff --git a/chrome/browser/android/document/document_web_contents_delegate.h b/chrome/browser/android/document/document_web_contents_delegate.h
index 15a484f..1bb00d7 100644
--- a/chrome/browser/android/document/document_web_contents_delegate.h
+++ b/chrome/browser/android/document/document_web_contents_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 
+#include <stdint.h>
+
 #include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 // Stub WebContentsDelegateAndroid that is meant to be a temporary substitute
diff --git a/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h b/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
index 2292751..946c843 100644
--- a/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
+++ b/chrome/browser/android/dom_distiller/distiller_ui_handle_android.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_DOM_DISTILLER_DISTILLER_UI_HANDLE_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_DOM_DISTILLER_DISTILLER_UI_HANDLE_ANDROID_H_
 
+#include "base/macros.h"
 #include "components/dom_distiller/content/browser/distiller_ui_handle.h"
 #include "content/public/browser/web_contents.h"
 
diff --git a/chrome/browser/android/download/android_download_manager_overwrite_infobar_delegate.h b/chrome/browser/android/download/android_download_manager_overwrite_infobar_delegate.h
index 5f38d6c..d794a81 100644
--- a/chrome/browser/android/download/android_download_manager_overwrite_infobar_delegate.h
+++ b/chrome/browser/android/download/android_download_manager_overwrite_infobar_delegate.h
@@ -9,6 +9,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "chrome/browser/android/download/download_overwrite_infobar_delegate.h"
 #include "components/infobars/core/infobar_delegate.h"
 
diff --git a/chrome/browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h b/chrome/browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h
index 1267faa..4fcf0ae 100644
--- a/chrome/browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h
+++ b/chrome/browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h
@@ -8,6 +8,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "chrome/browser/android/download/download_overwrite_infobar_delegate.h"
 #include "chrome/browser/download/download_target_determiner_delegate.h"
 #include "components/infobars/core/infobar_delegate.h"
diff --git a/chrome/browser/android/download/mock_download_controller_android.h b/chrome/browser/android/download/mock_download_controller_android.h
index acb80c9..50e621e 100644
--- a/chrome/browser/android/download/mock_download_controller_android.h
+++ b/chrome/browser/android/download/mock_download_controller_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_DOWNLOAD_MOCK_DOWNLOAD_CONTROLLER_ANDROID_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "content/public/browser/android/download_controller_android.h"
 
diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc
index 64be056..a4706fb 100644
--- a/chrome/browser/android/favicon_helper.cc
+++ b/chrome/browser/android/favicon_helper.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/favicon_helper.h"
 
 #include <jni.h>
+#include <stddef.h>
 
 #include <vector>
 
diff --git a/chrome/browser/android/favicon_helper.h b/chrome/browser/android/favicon_helper.h
index 14396fc..4c4da28 100644
--- a/chrome/browser/android/favicon_helper.h
+++ b/chrome/browser/android/favicon_helper.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 
diff --git a/chrome/browser/android/feedback/screenshot_task.cc b/chrome/browser/android/feedback/screenshot_task.cc
index a1efd65..519058a 100644
--- a/chrome/browser/android/feedback/screenshot_task.cc
+++ b/chrome/browser/android/feedback/screenshot_task.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/feedback/screenshot_task.h"
 
+#include <stddef.h>
+
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/android/find_in_page/find_in_page_bridge.h b/chrome/browser/android/find_in_page/find_in_page_bridge.h
index 1e49246..fea098a 100644
--- a/chrome/browser/android/find_in_page/find_in_page_bridge.h
+++ b/chrome/browser/android/find_in_page/find_in_page_bridge.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "content/public/browser/web_contents.h"
 
 class FindInPageBridge {
diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc
index 9d30b53..a3712f4 100644
--- a/chrome/browser/android/foreign_session_helper.cc
+++ b/chrome/browser/android/foreign_session_helper.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/foreign_session_helper.h"
 
 #include <jni.h>
+#include <stddef.h>
 
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/android/foreign_session_helper.h b/chrome/browser/android/foreign_session_helper.h
index e6d5af0..501fa12 100644
--- a/chrome/browser/android/foreign_session_helper.h
+++ b/chrome/browser/android/foreign_session_helper.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/sync_driver/sync_service_observer.h"
diff --git a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h
index c7dab3d..8b9eefd 100644
--- a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h
+++ b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h
@@ -9,6 +9,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
diff --git a/chrome/browser/android/history_report/data_observer.h b/chrome/browser/android/history_report/data_observer.h
index 3786335..fdabebc 100644
--- a/chrome/browser/android/history_report/data_observer.h
+++ b/chrome/browser/android/history_report/data_observer.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/history/core/browser/history_service_observer.h"
diff --git a/chrome/browser/android/history_report/data_provider.cc b/chrome/browser/android/history_report/data_provider.cc
index d589ece..cde2a3a 100644
--- a/chrome/browser/android/history_report/data_provider.cc
+++ b/chrome/browser/android/history_report/data_provider.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/android/history_report/data_provider.h"
+
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
@@ -105,9 +108,9 @@ DataProvider::DataProvider(Profile* profile,
 
 DataProvider::~DataProvider() {}
 
-scoped_ptr<std::vector<DeltaFileEntryWithData> > DataProvider::Query(
-    int64 last_seq_no,
-    int32 limit) {
+scoped_ptr<std::vector<DeltaFileEntryWithData>> DataProvider::Query(
+    int64_t last_seq_no,
+    int32_t limit) {
   if (last_seq_no == 0)
     RecreateLog();
   scoped_ptr<std::vector<DeltaFileEntryWithData> > entries;
diff --git a/chrome/browser/android/history_report/data_provider.h b/chrome/browser/android/history_report/data_provider.h
index 1959a9e..5e8f558 100644
--- a/chrome/browser/android/history_report/data_provider.h
+++ b/chrome/browser/android/history_report/data_provider.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_DATA_PROVIDER_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_DATA_PROVIDER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 
@@ -35,8 +38,8 @@ class DataProvider {
   ~DataProvider();
 
   // Provides up to limit delta file entries with sequence number > last_seq_no.
-  scoped_ptr<std::vector<DeltaFileEntryWithData> > Query(int64 last_seq_no,
-                                                         int32 limit);
+  scoped_ptr<std::vector<DeltaFileEntryWithData>> Query(int64_t last_seq_no,
+                                                        int32_t limit);
   void StartVisitMigrationToUsageBuffer(
       UsageReportsBufferService* buffer_service);
 
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb.cc b/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
index 554d94e..861b27d 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
@@ -23,11 +23,11 @@ namespace {
 const base::FilePath::CharType kDbFileName[] =
     FILE_PATH_LITERAL("DeltaFileLevelDb");
 
-int64 GetLastSeqNo(leveldb::DB* db) {
+int64_t GetLastSeqNo(leveldb::DB* db) {
   leveldb::ReadOptions options;
   scoped_ptr<leveldb::Iterator> db_iter(db->NewIterator(options));
   db_iter->SeekToLast();
-  int64 seq_no = 0;
+  int64_t seq_no = 0;
   if (db_iter->Valid()) {
     history_report::DeltaFileEntry last_entry;
     leveldb::Slice value_slice = db_iter->value();
@@ -40,7 +40,7 @@ int64 GetLastSeqNo(leveldb::DB* db) {
 void SaveChange(leveldb::DB* db,
                 const std::string& url,
                 const std::string& type) {
-  int64 seq_no = GetLastSeqNo(db) + 1;
+  int64_t seq_no = GetLastSeqNo(db) + 1;
   history_report::DeltaFileEntry entry;
   entry.set_seq_no(seq_no);
   entry.set_type(type);
@@ -65,8 +65,8 @@ class DeltaFileBackend::DigitsComparator : public leveldb::Comparator {
  public:
   int Compare(const leveldb::Slice& a,
               const leveldb::Slice& b) const override {
-    int64 first;
-    int64 second;
+    int64_t first;
+    int64_t second;
     // Keys which can't be parsed go to the end.
     if (!base::StringToInt64(a.ToString(), &first)) return 1;
     if (!base::StringToInt64(b.ToString(), &second)) return -1;
@@ -125,7 +125,7 @@ void DeltaFileBackend::PageDeleted(const GURL& url) {
   SaveChange(db_.get(), url.spec().c_str(), "del");
 }
 
-int64 DeltaFileBackend::Trim(int64 lower_bound) {
+int64_t DeltaFileBackend::Trim(int64_t lower_bound) {
   if (!EnsureInitialized()) return -1;
   leveldb::ReadOptions read_options;
   scoped_ptr<leveldb::Iterator> db_iter(db_->NewIterator(read_options));
@@ -136,7 +136,7 @@ int64 DeltaFileBackend::Trim(int64 lower_bound) {
   leveldb::Slice value_slice = db_iter->value();
   if (!first_entry.ParseFromArray(value_slice.data(), value_slice.size()))
     return -1;
-  int64 min_seq_no = first_entry.seq_no();
+  int64_t min_seq_no = first_entry.seq_no();
   db_iter->SeekToLast();
   if (!db_iter->Valid())
     return -1;
@@ -144,13 +144,13 @@ int64 DeltaFileBackend::Trim(int64 lower_bound) {
   value_slice = db_iter->value();
   if (!last_entry.ParseFromArray(value_slice.data(), value_slice.size()))
     return -1;
-  int64 max_seq_no = last_entry.seq_no();
+  int64_t max_seq_no = last_entry.seq_no();
   // We want to have at least one entry in delta file left to know
   // last sequence number in SaveChange.
   if (max_seq_no <= lower_bound)
     lower_bound = max_seq_no - 1;
   leveldb::WriteBatch updates;
-  for (int64 seq_no = min_seq_no; seq_no <= lower_bound; ++seq_no) {
+  for (int64_t seq_no = min_seq_no; seq_no <= lower_bound; ++seq_no) {
     std::string key;
     base::SStringPrintf(&key, "%" PRId64, seq_no);
     updates.Delete(leveldb::Slice(key));
@@ -167,7 +167,7 @@ int64 DeltaFileBackend::Trim(int64 lower_bound) {
 bool DeltaFileBackend::Recreate(const std::vector<std::string>& urls) {
   if (!EnsureInitialized()) return false;
   Clear();
-  int64 seq_no = 1;
+  int64_t seq_no = 1;
   leveldb::WriteBatch updates;
   for (std::vector<std::string>::const_iterator it = urls.begin();
        it != urls.end();
@@ -190,9 +190,9 @@ bool DeltaFileBackend::Recreate(const std::vector<std::string>& urls) {
   return false;
 }
 
-scoped_ptr<std::vector<DeltaFileEntryWithData> > DeltaFileBackend::Query(
-    int64 last_seq_no,
-    int32 limit) {
+scoped_ptr<std::vector<DeltaFileEntryWithData>> DeltaFileBackend::Query(
+    int64_t last_seq_no,
+    int32_t limit) {
   if (!EnsureInitialized())
     return make_scoped_ptr(new std::vector<DeltaFileEntryWithData>());
   std::string start;
@@ -201,7 +201,7 @@ scoped_ptr<std::vector<DeltaFileEntryWithData> > DeltaFileBackend::Query(
   scoped_ptr<leveldb::Iterator> db_it(db_->NewIterator(options));
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result(
       new std::vector<DeltaFileEntryWithData>());
-  int32 count = 0;
+  int32_t count = 0;
   for (db_it->Seek(start); db_it->Valid() && count < limit; db_it->Next()) {
     DeltaFileEntry entry;
     leveldb::Slice value_slice = db_it->value();
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb.h b/chrome/browser/android/history_report/delta_file_backend_leveldb.h
index 85f0f91..d4295d9 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb.h
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_BACKEND_LEVELDB_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_BACKEND_LEVELDB_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 class GURL;
@@ -33,13 +36,13 @@ class DeltaFileBackend {
   // Removes all delta file entries with
   // sequence number <= min(|lower_bound|, max sequence number - 1).
   // Returns max sequence number in delta file.
-  int64 Trim(int64 lower_bound);
+  int64_t Trim(int64_t lower_bound);
   // Recreates delta file using given |urls|.
   bool Recreate(const std::vector<std::string>& urls);
   // Provides up to |limit| delta file entries with
   // sequence number > |last_seq_no|.
-  scoped_ptr<std::vector<DeltaFileEntryWithData> > Query(int64 last_seq_no,
-                                                         int32 limit);
+  scoped_ptr<std::vector<DeltaFileEntryWithData>> Query(int64_t last_seq_no,
+                                                        int32_t limit);
   // Removes all entries from delta file
   void Clear();
 
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc b/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
index cd39187..f01d556 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb_unittest.cc
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/android/history_report/delta_file_backend_leveldb.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/history_report/delta_file_commons.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -155,7 +158,7 @@ TEST_F(DeltaFileBackendTest, Trim) {
   backend_->PageDeleted(test_url);
   backend_->PageDeleted(test_url);
   // Trim all entries with sequence number <= 3.
-  int64 max_seq_no = backend_->Trim(3);
+  int64_t max_seq_no = backend_->Trim(3);
   EXPECT_EQ(5, max_seq_no);
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result =
       backend_->Query(0, 10);
@@ -179,7 +182,7 @@ TEST_F(DeltaFileBackendTest, TrimLowerBoundEqualToMaxSeqNo) {
   backend_->PageDeleted(test_url);
   // Trim all entries with sequence number <= 5 but leave at least one entry
   // in delta file.
-  int64 max_seq_no = backend_->Trim(5);
+  int64_t max_seq_no = backend_->Trim(5);
   EXPECT_EQ(5, max_seq_no);
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result =
       backend_->Query(0, 10);
@@ -202,7 +205,7 @@ TEST_F(DeltaFileBackendTest, TrimLowerBoundGreaterThanMaxSeqNo) {
   backend_->PageDeleted(test_url);
   // Trim all entries with sequence number <= 6 but leave at least one entry
   // in delta file.
-  int64 max_seq_no = backend_->Trim(6);
+  int64_t max_seq_no = backend_->Trim(6);
   EXPECT_EQ(5, max_seq_no);
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result =
       backend_->Query(0, 10);
@@ -221,7 +224,7 @@ TEST_F(DeltaFileBackendTest, TrimDeltaFileWithSingleEntry) {
   // Trim all entries with sequence number <= 1 but leave at least one entry
   // in delta file. Should not remove any entries since there's only one
   // in delta file.
-  int64 max_seq_no = backend_->Trim(1);
+  int64_t max_seq_no = backend_->Trim(1);
   EXPECT_EQ(1, max_seq_no);
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result =
       backend_->Query(0, 10);
diff --git a/chrome/browser/android/history_report/delta_file_commons.cc b/chrome/browser/android/history_report/delta_file_commons.cc
index 027f82d..d7d6cba 100644
--- a/chrome/browser/android/history_report/delta_file_commons.cc
+++ b/chrome/browser/android/history_report/delta_file_commons.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/history_report/delta_file_commons.h"
 
+#include <stddef.h>
+
 #include <iomanip>
 
 #include "base/strings/string_number_conversions.h"
@@ -52,7 +54,7 @@ DeltaFileEntryWithData::DeltaFileEntryWithData(DeltaFileEntry entry)
 
 DeltaFileEntryWithData::~DeltaFileEntryWithData() {}
 
-int64 DeltaFileEntryWithData::SeqNo() const {
+int64_t DeltaFileEntryWithData::SeqNo() const {
   return entry_.seq_no();
 }
 
@@ -86,7 +88,7 @@ std::string DeltaFileEntryWithData::UrlToId(const std::string& url) {
   id << std::setfill('0') << std::setw(kUrlLengthWidth) << url.size();
 
   // 2. SHA-256 of URL.
-  uint8 hash[kSHA256ByteSize];
+  uint8_t hash[kSHA256ByteSize];
   crypto::SHA256HashString(url, hash, sizeof(hash));
   id << base::HexEncode(hash, sizeof(hash));
 
@@ -112,9 +114,9 @@ base::string16 DeltaFileEntryWithData::Title() const {
   return data_.title();
 }
 
-int32 DeltaFileEntryWithData::Score() const {
+int32_t DeltaFileEntryWithData::Score() const {
   if (!Valid()) return 0;
-  int32 score = data_.visit_count() + data_.typed_count();
+  int32_t score = data_.visit_count() + data_.typed_count();
   if (is_bookmark_) score = (score + 1) * kBookmarkScoreBonusMultiplier;
   return score;
 }
diff --git a/chrome/browser/android/history_report/delta_file_commons.h b/chrome/browser/android/history_report/delta_file_commons.h
index 2c2cd30..42f1246 100644
--- a/chrome/browser/android/history_report/delta_file_commons.h
+++ b/chrome/browser/android/history_report/delta_file_commons.h
@@ -5,7 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_COMMONS_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_COMMONS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/android/proto/delta_file.pb.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ -22,7 +23,7 @@ class DeltaFileEntryWithData {
   ~DeltaFileEntryWithData();
 
   // Returns sequence number of this delta file entry.
-  int64 SeqNo() const;
+  int64_t SeqNo() const;
 
   // Returns type of delta file entry ('add' or 'del').
   std::string Type() const;
@@ -37,7 +38,7 @@ class DeltaFileEntryWithData {
   base::string16 Title() const;
 
   // Returns ranking score of url described by delta file entry.
-  int32 Score() const;
+  int32_t Score() const;
 
   // Returns part of delta file entry's url
   // which will be used as a key in search index.
diff --git a/chrome/browser/android/history_report/delta_file_commons_unittest.cc b/chrome/browser/android/history_report/delta_file_commons_unittest.cc
index 11a6f20..a593d3f 100644
--- a/chrome/browser/android/history_report/delta_file_commons_unittest.cc
+++ b/chrome/browser/android/history_report/delta_file_commons_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/android/history_report/delta_file_commons.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/history_types.h"
@@ -208,7 +211,8 @@ TEST_F(DeltaFileEntryWithDataTest, IdForLongUrl) {
 
   std::stringstream expected_length_stream;
   expected_length_stream << std::setfill('0') << std::setw(8)
-      << base::Uint64ToString(static_cast<uint64>(url.str().size()));
+                         << base::Uint64ToString(
+                                static_cast<uint64_t>(url.str().size()));
   std::string length = data.Id().substr(0, 8);
   EXPECT_EQ(expected_length_stream.str(), length);
 
diff --git a/chrome/browser/android/history_report/delta_file_service.cc b/chrome/browser/android/history_report/delta_file_service.cc
index c4532f4..ce0f661 100644
--- a/chrome/browser/android/history_report/delta_file_service.cc
+++ b/chrome/browser/android/history_report/delta_file_service.cc
@@ -23,19 +23,19 @@ void DoDeletePage(history_report::DeltaFileBackend* backend, const GURL& url) {
 }
 
 void DoTrim(history_report::DeltaFileBackend* backend,
-            int64 lower_bound,
+            int64_t lower_bound,
             base::WaitableEvent* finished,
-            int64* result) {
+            int64_t* result) {
   *result = backend->Trim(lower_bound);
   finished->Signal();
 }
 
 void DoQuery(
     history_report::DeltaFileBackend* backend,
-    int64 last_seq_no,
-    int32 limit,
+    int64_t last_seq_no,
+    int32_t limit,
     base::WaitableEvent* finished,
-    scoped_ptr<std::vector<history_report::DeltaFileEntryWithData> >* result) {
+    scoped_ptr<std::vector<history_report::DeltaFileEntryWithData>>* result) {
   *result = backend->Query(last_seq_no, limit).Pass();
   finished->Signal();
 }
@@ -94,8 +94,8 @@ void DeltaFileService::PageDeleted(const GURL& url) {
       base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 }
 
-int64 DeltaFileService::Trim(int64 lower_bound) {
-  int64 result;
+int64_t DeltaFileService::Trim(int64_t lower_bound) {
+  int64_t result;
   base::WaitableEvent finished(false, false);
   base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
   pool->PostSequencedWorkerTaskWithShutdownBehavior(
@@ -111,9 +111,9 @@ int64 DeltaFileService::Trim(int64 lower_bound) {
   return result;
 }
 
-scoped_ptr<std::vector<DeltaFileEntryWithData> > DeltaFileService::Query(
-    int64 last_seq_no,
-    int32 limit) {
+scoped_ptr<std::vector<DeltaFileEntryWithData>> DeltaFileService::Query(
+    int64_t last_seq_no,
+    int32_t limit) {
   scoped_ptr<std::vector<DeltaFileEntryWithData> > result;
   base::WaitableEvent finished(false, false);
   base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
diff --git a/chrome/browser/android/history_report/delta_file_service.h b/chrome/browser/android/history_report/delta_file_service.h
index a377b49..dda4e86 100644
--- a/chrome/browser/android/history_report/delta_file_service.h
+++ b/chrome/browser/android/history_report/delta_file_service.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_SERVICE_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_DELTA_FILE_SERVICE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 
@@ -34,13 +37,13 @@ class DeltaFileService {
   void PageDeleted(const GURL& url);
   // Removes all delta file entries with seqno <= lower_bound.
   // Returns max seqno in delta file.
-  int64 Trim(int64 lower_bound);
+  int64_t Trim(int64_t lower_bound);
   // Removes all data from delta file and populates it with new addition
   // entries for given urls.
   bool Recreate(const std::vector<std::string>& urls);
   // Provides up to limit delta file entries with seqno > last_seq_no.
-  scoped_ptr<std::vector<DeltaFileEntryWithData> > Query(int64 last_seq_no,
-                                                         int32 limit);
+  scoped_ptr<std::vector<DeltaFileEntryWithData>> Query(int64_t last_seq_no,
+                                                        int32_t limit);
   // Removes all entries from delta file.
   void Clear();
 
diff --git a/chrome/browser/android/history_report/get_all_urls_from_history_task.h b/chrome/browser/android/history_report/get_all_urls_from_history_task.h
index 04ece01..6cd1316 100644
--- a/chrome/browser/android/history_report/get_all_urls_from_history_task.h
+++ b/chrome/browser/android/history_report/get_all_urls_from_history_task.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
diff --git a/chrome/browser/android/history_report/historic_visits_migration_task.h b/chrome/browser/android/history_report/historic_visits_migration_task.h
index 482167e..aa514c9 100644
--- a/chrome/browser/android/history_report/historic_visits_migration_task.h
+++ b/chrome/browser/android/history_report/historic_visits_migration_task.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_HISTORIC_VISITS_MIGRATION_TASK_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_HISTORIC_VISITS_MIGRATION_TASK_H_
 
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/history/core/browser/history_db_task.h"
 
diff --git a/chrome/browser/android/history_report/history_report_jni_bridge.cc b/chrome/browser/android/history_report/history_report_jni_bridge.cc
index ef37ce4..86d2456 100644
--- a/chrome/browser/android/history_report/history_report_jni_bridge.cc
+++ b/chrome/browser/android/history_report/history_report_jni_bridge.cc
@@ -3,6 +3,10 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/android/history_report/history_report_jni_bridge.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ -89,7 +93,7 @@ base::android::ScopedJavaLocalRef<jobjectArray> HistoryReportJniBridge::Query(
       history_report::Java_HistoryReportJniBridge_createDeltaFileEntriesArray(
           env, entries->size());
 
-  int64 max_seq_no = 0;
+  int64_t max_seq_no = 0;
   for (size_t i = 0; i < entries->size(); ++i) {
     const DeltaFileEntryWithData& entry = (*entries)[i];
     max_seq_no = max_seq_no < entry.SeqNo() ? entry.SeqNo() : max_seq_no;
diff --git a/chrome/browser/android/history_report/history_report_jni_bridge.h b/chrome/browser/android/history_report/history_report_jni_bridge.h
index 1c5e019b..7251817 100644
--- a/chrome/browser/android/history_report/history_report_jni_bridge.h
+++ b/chrome/browser/android/history_report/history_report_jni_bridge.h
@@ -10,6 +10,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace bookmarks {
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
index 554f7f0..5171a64 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
@@ -58,8 +58,8 @@ bool UsageReportsBufferBackend::Init() {
 }
 
 void UsageReportsBufferBackend::AddVisit(const std::string& id,
-    int64 timestamp_ms,
-    bool typed_visit) {
+                                         int64_t timestamp_ms,
+                                         bool typed_visit) {
   if (!db_.get()) {
     LOG(WARNING) << "AddVisit db not initilized.";
     return;
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend.h b/chrome/browser/android/history_report/usage_reports_buffer_backend.h
index 3a46ed2..3c275a1 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend.h
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_USAGE_REPORTS_BUFFER_BACKEND_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_USAGE_REPORTS_BUFFER_BACKEND_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
@@ -33,7 +36,7 @@ class UsageReportsBufferBackend {
   // Creates and initializes the internal data structures.
   bool Init();
 
-  void AddVisit(const std::string& id, int64 timestamp_ms, bool typed_visit);
+  void AddVisit(const std::string& id, int64_t timestamp_ms, bool typed_visit);
 
   // Returns a set of up to |amount| usage reports.
   scoped_ptr<std::vector<UsageReport> > GetUsageReportsBatch(int amount);
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc b/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
index e663da4..16a3b04 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend_unittest.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/browser/android/history_report/usage_reports_buffer_backend.h"
 
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/history_report/usage_report_util.h"
 #include "chrome/browser/android/proto/delta_file.pb.h"
@@ -13,9 +16,9 @@
 
 namespace {
 void VerifyUsageReport(history_report::UsageReport& actual,
-    const std::string& expected_id,
-    int64 expected_timestamp_ms,
-    bool expected_typed_visit) {
+                       const std::string& expected_id,
+                       int64_t expected_timestamp_ms,
+                       bool expected_typed_visit) {
   EXPECT_EQ(expected_id, actual.id());
   EXPECT_EQ(expected_timestamp_ms, actual.timestamp_ms());
   EXPECT_EQ(expected_typed_visit, actual.typed_visit());
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_service.cc b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
index 620e262..4d8680d 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_service.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
@@ -20,7 +20,7 @@ void DoInit(history_report::UsageReportsBufferBackend* backend) {
 
 void DoAddVisit(history_report::UsageReportsBufferBackend* backend,
                 const std::string id,
-                int64 timestamp_ms,
+                int64_t timestamp_ms,
                 bool typed_visit) {
   backend->AddVisit(id, timestamp_ms, typed_visit);
 }
@@ -34,9 +34,9 @@ void DoRemove(history_report::UsageReportsBufferBackend* backend,
 
 void DoGetUsageReportsBatch(
     history_report::UsageReportsBufferBackend* backend,
-    int32 batch_size,
+    int32_t batch_size,
     base::WaitableEvent* finished,
-    scoped_ptr<std::vector<history_report::UsageReport> >* result) {
+    scoped_ptr<std::vector<history_report::UsageReport>>* result) {
   *result = backend->GetUsageReportsBatch(batch_size).Pass();
   finished->Signal();
 }
@@ -79,8 +79,8 @@ void UsageReportsBufferService::Init() {
 }
 
 void UsageReportsBufferService::AddVisit(const std::string& id,
-    int64 timestamp_ms,
-    bool typed_visit) {
+                                         int64_t timestamp_ms,
+                                         bool typed_visit) {
   base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
   pool->PostSequencedWorkerTaskWithShutdownBehavior(
       worker_pool_token_,
@@ -93,8 +93,8 @@ void UsageReportsBufferService::AddVisit(const std::string& id,
       base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 }
 
-scoped_ptr<std::vector<UsageReport> >
-UsageReportsBufferService::GetUsageReportsBatch(int32 batch_size) {
+scoped_ptr<std::vector<UsageReport>>
+UsageReportsBufferService::GetUsageReportsBatch(int32_t batch_size) {
   scoped_ptr<std::vector<UsageReport> > result;
   base::WaitableEvent finished(false, false);
   base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_service.h b/chrome/browser/android/history_report/usage_reports_buffer_service.h
index f98b3b5..2c8bdaef 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_service.h
+++ b/chrome/browser/android/history_report/usage_reports_buffer_service.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_USAGE_REPORTS_BUFFER_SERVICE_H_
 #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_USAGE_REPORTS_BUFFER_SERVICE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 
@@ -32,10 +35,10 @@ class UsageReportsBufferService {
   void Init();
 
   // Add report about page visit to the buffer. It's asynchronous.
-  void AddVisit(const std::string& id, int64 timestamp_ms, bool typed_visit);
+  void AddVisit(const std::string& id, int64_t timestamp_ms, bool typed_visit);
 
   // Get a batch of usage reports of size up to |batch_size|. It's synchronous.
-  scoped_ptr<std::vector<UsageReport> > GetUsageReportsBatch(int32 batch_size);
+  scoped_ptr<std::vector<UsageReport>> GetUsageReportsBatch(int32_t batch_size);
 
   // Remove given usage reports from buffer. It's synchronous.
   void Remove(const std::vector<std::string>& report_ids);
diff --git a/chrome/browser/android/hung_renderer_infobar_delegate.h b/chrome/browser/android/hung_renderer_infobar_delegate.h
index c9e99d5..16b12d5 100644
--- a/chrome/browser/android/hung_renderer_infobar_delegate.h
+++ b/chrome/browser/android/hung_renderer_infobar_delegate.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_HUNG_RENDERER_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_HUNG_RENDERER_INFOBAR_DELEGATE_H_
 
+#include "base/macros.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 
 namespace content {
diff --git a/chrome/browser/android/intercept_download_resource_throttle.h b/chrome/browser/android/intercept_download_resource_throttle.h
index 6ecfb43..0194076 100644
--- a/chrome/browser/android/intercept_download_resource_throttle.h
+++ b/chrome/browser/android/intercept_download_resource_throttle.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_INTERCEPT_DOWNLOAD_RESOURCE_THROTTLE_H_
 #define CHROME_BROWSER_ANDROID_INTERCEPT_DOWNLOAD_RESOURCE_THROTTLE_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "content/public/browser/resource_throttle.h"
 
 namespace net {
diff --git a/chrome/browser/android/large_icon_bridge.h b/chrome/browser/android/large_icon_bridge.h
index b0678f8..3160b13 100644
--- a/chrome/browser/android/large_icon_bridge.h
+++ b/chrome/browser/android/large_icon_bridge.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 
diff --git a/chrome/browser/android/location_settings_impl.h b/chrome/browser/android/location_settings_impl.h
index 6fbc8da..46d962a 100644
--- a/chrome/browser/android/location_settings_impl.h
+++ b/chrome/browser/android/location_settings_impl.h
@@ -7,6 +7,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/location_settings.h"
 
diff --git a/chrome/browser/android/logo_bridge.cc b/chrome/browser/android/logo_bridge.cc
index 22f63a1..a1e053d 100644
--- a/chrome/browser/android/logo_bridge.cc
+++ b/chrome/browser/android/logo_bridge.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/logo_bridge.h"
 
 #include <jni.h>
+#include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ -158,8 +159,9 @@ void LogoBridge::OnURLFetchComplete(const net::URLFetcher* source) {
   source->GetResponseAsString(&response);
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  ScopedJavaLocalRef<jbyteArray> j_bytes = ToJavaByteArray(
-      env, reinterpret_cast<const uint8*>(response.data()), response.length());
+  ScopedJavaLocalRef<jbyteArray> j_bytes =
+      ToJavaByteArray(env, reinterpret_cast<const uint8_t*>(response.data()),
+                      response.length());
   ScopedJavaLocalRef<jobject> j_gif_image =
       Java_LogoBridge_createGifImage(env, j_bytes.obj());
   Java_AnimatedLogoCallback_onAnimatedLogoAvailable(env, j_callback_.obj(),
diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc
index 1eebfbd..c6f16b9 100644
--- a/chrome/browser/android/logo_service.cc
+++ b/chrome/browser/android/logo_service.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/logo_service.h"
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/image_decoder.h"
diff --git a/chrome/browser/android/logo_service.h b/chrome/browser/android/logo_service.h
index cc39b8b..6a89e4c 100644
--- a/chrome/browser/android/logo_service.h
+++ b/chrome/browser/android/logo_service.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_LOGO_SERVICE_H_
 #define CHROME_BROWSER_ANDROID_LOGO_SERVICE_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/android/media/media_throttle_infobar_delegate.cc b/chrome/browser/android/media/media_throttle_infobar_delegate.cc
index ae7b051..05efb8d 100644
--- a/chrome/browser/android/media/media_throttle_infobar_delegate.cc
+++ b/chrome/browser/android/media/media_throttle_infobar_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/media/media_throttle_infobar_delegate.h"
 
+#include <stddef.h>
+
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/android/media/media_throttle_infobar_delegate.h b/chrome/browser/android/media/media_throttle_infobar_delegate.h
index 0df3b79..ca05c8e 100644
--- a/chrome/browser/android/media/media_throttle_infobar_delegate.h
+++ b/chrome/browser/android/media/media_throttle_infobar_delegate.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 
 namespace content {
diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browser/android/metrics/uma_session_stats.cc
index ba2f527..40f8e1a 100644
--- a/chrome/browser/android/metrics/uma_session_stats.cc
+++ b/chrome/browser/android/metrics/uma_session_stats.cc
@@ -133,7 +133,7 @@ static void RegisterExternalExperiment(JNIEnv* env,
   const std::string group_name_utf8 = base::IntToString(experiment_id);
 
   variations::ActiveGroupId active_group;
-  active_group.name = static_cast<uint32>(study_id);
+  active_group.name = static_cast<uint32_t>(study_id);
   active_group.group = metrics::HashName(group_name_utf8);
   variations::AssociateGoogleVariationIDForceHashes(
       variations::GOOGLE_WEB_PROPERTIES, active_group,
diff --git a/chrome/browser/android/metrics/uma_session_stats.h b/chrome/browser/android/metrics/uma_session_stats.h
index 2f9ca5b..ea5ed70a 100644
--- a/chrome/browser/android/metrics/uma_session_stats.h
+++ b/chrome/browser/android/metrics/uma_session_stats.h
@@ -6,9 +6,11 @@
 #define CHROME_BROWSER_ANDROID_METRICS_UMA_SESSION_STATS_H_
 
 #include <jni.h>
+#include <stdint.h>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
diff --git a/chrome/browser/android/metrics/uma_utils.cc b/chrome/browser/android/metrics/uma_utils.cc
index 12d9f18..3d8c415 100644
--- a/chrome/browser/android/metrics/uma_utils.cc
+++ b/chrome/browser/android/metrics/uma_utils.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/metrics/uma_utils.h"
 
+#include <stdint.h>
+
 #include "jni/UmaUtils_jni.h"
 
 namespace chrome {
@@ -11,7 +13,7 @@ namespace android {
 
 base::Time GetMainEntryPointTime() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  int64 startTimeUnixMs = Java_UmaUtils_getMainEntryPointTime(env);
+  int64_t startTimeUnixMs = Java_UmaUtils_getMainEntryPointTime(env);
   return base::Time::UnixEpoch() +
          base::TimeDelta::FromMilliseconds(startTimeUnixMs);
 }
diff --git a/chrome/browser/android/mock_location_settings.h b/chrome/browser/android/mock_location_settings.h
index b806ad6..0e46d35 100644
--- a/chrome/browser/android/mock_location_settings.h
+++ b/chrome/browser/android/mock_location_settings.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_MOCK_LOCATION_SETTINGS_H_
 #define CHROME_BROWSER_ANDROID_MOCK_LOCATION_SETTINGS_H_
 
+#include "base/macros.h"
 #include "chrome/browser/android/location_settings.h"
 
 // Mock implementation of LocationSettings for unit tests.
diff --git a/chrome/browser/android/most_visited_sites.h b/chrome/browser/android/most_visited_sites.h
index b921d21..660eb9ad 100644
--- a/chrome/browser/android/most_visited_sites.h
+++ b/chrome/browser/android/most_visited_sites.h
@@ -6,12 +6,14 @@
 #define CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_
 
 #include <jni.h>
+#include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
diff --git a/chrome/browser/android/most_visited_sites_unittest.cc b/chrome/browser/android/most_visited_sites_unittest.cc
index 4834aaf..31a5eb7 100644
--- a/chrome/browser/android/most_visited_sites_unittest.cc
+++ b/chrome/browser/android/most_visited_sites_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 <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/android/new_tab_page_prefs.h b/chrome/browser/android/new_tab_page_prefs.h
index 490066a..70bacef 100644
--- a/chrome/browser/android/new_tab_page_prefs.h
+++ b/chrome/browser/android/new_tab_page_prefs.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 
 class NewTabPagePrefs {
diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.cc b/chrome/browser/android/offline_pages/offline_page_bridge.cc
index 54f42a4..f755433 100644
--- a/chrome/browser/android/offline_pages/offline_page_bridge.cc
+++ b/chrome/browser/android/offline_pages/offline_page_bridge.cc
@@ -6,7 +6,6 @@
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -106,7 +105,7 @@ void OfflinePageBridge::OfflinePageModelChanged(OfflinePageModel* model) {
   Java_OfflinePageBridge_offlinePageModelChanged(env, obj.obj());
 }
 
-void OfflinePageBridge::OfflinePageDeleted(int64 bookmark_id) {
+void OfflinePageBridge::OfflinePageDeleted(int64_t bookmark_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
@@ -209,7 +208,7 @@ void OfflinePageBridge::DeletePages(
   ScopedJavaGlobalRef<jobject> j_callback_ref;
   j_callback_ref.Reset(env, j_callback_obj);
 
-  std::vector<int64> bookmark_ids;
+  std::vector<int64_t> bookmark_ids;
   base::android::JavaLongArrayToInt64Vector(env, bookmark_ids_array,
                                             &bookmark_ids);
 
diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.h b/chrome/browser/android/offline_pages/offline_page_bridge.h
index a141e55..11c67f5 100644
--- a/chrome/browser/android/offline_pages/offline_page_bridge.h
+++ b/chrome/browser/android/offline_pages/offline_page_bridge.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_BRIDGE_H_
 
+#include <stdint.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "components/offline_pages/offline_page_model.h"
 
 namespace content {
@@ -30,7 +33,7 @@ class OfflinePageBridge : public OfflinePageModel::Observer {
   // OfflinePageModel::Observer implementation.
   void OfflinePageModelLoaded(OfflinePageModel* model) override;
   void OfflinePageModelChanged(OfflinePageModel* model) override;
-  void OfflinePageDeleted(int64 bookmark_id) override;
+  void OfflinePageDeleted(int64_t bookmark_id) override;
 
   void GetAllPages(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
diff --git a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
index 10f5f2b..b87e238 100644
--- a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
+++ b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
@@ -114,7 +114,7 @@ void OfflinePageMHTMLArchiver::GenerateMHTML(
 void OfflinePageMHTMLArchiver::OnGenerateMHTMLDone(
     const GURL& url,
     const base::FilePath& file_path,
-    int64 file_size) {
+    int64_t file_size) {
   if (file_size < 0) {
     ReportFailure(ArchiverResult::ERROR_ARCHIVE_CREATION_FAILED);
   } else {
diff --git a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
index 7d4dc6a..7f40172 100644
--- a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
+++ b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_MHTML_ARCHIVER_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_MHTML_ARCHIVER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "components/offline_pages/offline_page_archiver.h"
@@ -65,14 +68,14 @@ class OfflinePageMHTMLArchiver : public OfflinePageArchiver {
   // Callback for Generating MHTML.
   void OnGenerateMHTMLDone(const GURL& url,
                            const base::FilePath& file_path,
-                           int64 file_size);
+                           int64_t file_size);
 
   // Sends the result of archiving a page to the client that requested archive
   // creation.
   void ReportResult(ArchiverResult result,
                     const GURL& url,
                     const base::FilePath& file_path,
-                    int64 file_size);
+                    int64_t file_size);
   void ReportFailure(ArchiverResult result);
 
  private:
diff --git a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc
index 2191c74..a8c4fc5 100644
--- a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc
+++ b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
@@ -22,7 +25,7 @@ namespace {
 const char kTestURL[] = "http://example.com/";
 const base::FilePath::CharType kTestFilePath[] = FILE_PATH_LITERAL(
     "/archive_dir/offline_page.mhtml");
-const int64 kTestFileSize = 123456LL;
+const int64_t kTestFileSize = 123456LL;
 
 class TestMHTMLArchiver : public OfflinePageMHTMLArchiver {
  public:
@@ -97,7 +100,7 @@ class OfflinePageMHTMLArchiverTest : public testing::Test {
     return last_result_;
   }
   const base::FilePath& last_file_path() const { return last_file_path_; }
-  int64 last_file_size() const { return last_file_size_; }
+  int64_t last_file_size() const { return last_file_size_; }
 
   const OfflinePageArchiver::CreateArchiveCallback callback() {
     return base::Bind(&OfflinePageMHTMLArchiverTest::OnCreateArchiveDone,
@@ -109,13 +112,13 @@ class OfflinePageMHTMLArchiverTest : public testing::Test {
                            OfflinePageArchiver::ArchiverResult result,
                            const GURL& url,
                            const base::FilePath& file_path,
-                           int64 file_size);
+                           int64_t file_size);
 
   OfflinePageArchiver* last_archiver_;
   OfflinePageArchiver::ArchiverResult last_result_;
   GURL last_url_;
   base::FilePath last_file_path_;
-  int64 last_file_size_;
+  int64_t last_file_size_;
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
@@ -146,7 +149,7 @@ void OfflinePageMHTMLArchiverTest::OnCreateArchiveDone(
     OfflinePageArchiver::ArchiverResult result,
     const GURL& url,
     const base::FilePath& file_path,
-    int64 file_size) {
+    int64_t file_size) {
   last_url_ = url;
   last_archiver_ = archiver;
   last_result_ = result;
diff --git a/chrome/browser/android/offline_pages/offline_page_utils.cc b/chrome/browser/android/offline_pages/offline_page_utils.cc
index 0387549..6f4a624 100644
--- a/chrome/browser/android/offline_pages/offline_page_utils.cc
+++ b/chrome/browser/android/offline_pages/offline_page_utils.cc
@@ -95,7 +95,7 @@ GURL OfflinePageUtils::GetOnlineURLForOfflineURL(
 }
 
 // static
-int64 OfflinePageUtils::GetBookmarkIdForOfflineURL(
+int64_t OfflinePageUtils::GetBookmarkIdForOfflineURL(
     content::BrowserContext* browser_context,
     const GURL& offline_url) {
   const offline_pages::OfflinePageItem* offline_page =
diff --git a/chrome/browser/android/offline_pages/offline_page_utils.h b/chrome/browser/android/offline_pages/offline_page_utils.h
index 54ef117..f06d964 100644
--- a/chrome/browser/android/offline_pages/offline_page_utils.h
+++ b/chrome/browser/android/offline_pages/offline_page_utils.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_UTILS_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_UTILS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
 
 class GURL;
 
@@ -32,7 +32,7 @@ class OfflinePageUtils {
       const GURL& offline_url);
 
   // Gets a bookmark ID related to the |offline_url|.
-  static int64 GetBookmarkIdForOfflineURL(
+  static int64_t GetBookmarkIdForOfflineURL(
       content::BrowserContext* browser_context,
       const GURL& offline_url);
 
diff --git a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
index 8c2f940..8f34302 100644
--- a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
+++ b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
 
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
@@ -29,9 +31,9 @@ namespace {
 const GURL kTestPage1Url("http://test.org/page1");
 const GURL kTestPage2Url("http://test.org/page2");
 const GURL kTestPage3Url("http://test.org/page3");
-const int64 kTestPage1BookmarkId = 1234;
-const int64 kTestPage2BookmarkId = 5678;
-const int64 kTestFileSize = 876543LL;
+const int64_t kTestPage1BookmarkId = 1234;
+const int64_t kTestPage2BookmarkId = 5678;
+const int64_t kTestFileSize = 876543LL;
 
 }  // namespace
 
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index a0608ff..51b2776 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.h b/chrome/browser/android/omnibox/autocomplete_controller_android.h
index 1f180da..b4c1e9e 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.h
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/android/jni_weak_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/android/omnibox/omnibox_prerender.h b/chrome/browser/android/omnibox/omnibox_prerender.h
index 11636f6e..d8a0d61 100644
--- a/chrome/browser/android/omnibox/omnibox_prerender.h
+++ b/chrome/browser/android/omnibox/omnibox_prerender.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_OMNIBOX_OMNIBOX_PRERENDER_H_
 
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/android/password_ui_view_android.h b/chrome/browser/android/password_ui_view_android.h
index 7374e7a..370dee1 100644
--- a/chrome/browser/android/password_ui_view_android.h
+++ b/chrome/browser/android/password_ui_view_android.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_ANDROID_PASSWORD_UI_VIEW_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_PASSWORD_UI_VIEW_ANDROID_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/passwords/password_manager_presenter.h"
 #include "chrome/browser/ui/passwords/password_ui_view.h"
diff --git a/chrome/browser/android/popular_sites.cc b/chrome/browser/android/popular_sites.cc
index b735219..639ef22 100644
--- a/chrome/browser/android/popular_sites.cc
+++ b/chrome/browser/android/popular_sites.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/popular_sites.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/android/precache/precache_launcher.h b/chrome/browser/android/precache/precache_launcher.h
index 49656a7..8c73c4d 100644
--- a/chrome/browser/android/precache/precache_launcher.h
+++ b/chrome/browser/android/precache/precache_launcher.h
@@ -9,6 +9,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
 class PrecacheLauncher {
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index bfd5d66..552afc5 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
+#include <stddef.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index e5d3fc4..e51750a 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
diff --git a/chrome/browser/android/profiles/profile_downloader_android.cc b/chrome/browser/android/profiles/profile_downloader_android.cc
index 9ff6f4d..635689d 100644
--- a/chrome/browser/android/profiles/profile_downloader_android.cc
+++ b/chrome/browser/android/profiles/profile_downloader_android.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/browser/android/profiles/profile_downloader_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/android/provider/blocking_ui_thread_async_request.h b/chrome/browser/android/provider/blocking_ui_thread_async_request.h
index dfcf137..c8e17ae 100644
--- a/chrome/browser/android/provider/blocking_ui_thread_async_request.h
+++ b/chrome/browser/android/provider/blocking_ui_thread_async_request.h
@@ -7,6 +7,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/android/provider/run_on_ui_thread_blocking.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.h b/chrome/browser/android/provider/bookmark_model_observer_task.h
index 2746d24..e557c2e 100644
--- a/chrome/browser/android/provider/bookmark_model_observer_task.h
+++ b/chrome/browser/android/provider/bookmark_model_observer_task.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_BOOKMARK_MODEL_OBSERVER_TASK_H_
 #define CHROME_BROWSER_ANDROID_PROVIDER_BOOKMARK_MODEL_OBSERVER_TASK_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 
 // Base class for synchronous tasks that involve the bookmark model.
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
index 8a9aa42..e9a079e 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.cc
+++ b/chrome/browser/android/provider/chrome_browser_provider.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/provider/chrome_browser_provider.h"
 
+#include <stdint.h>
+
 #include <cmath>
 #include <list>
 #include <utility>
@@ -12,6 +14,7 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
@@ -96,8 +99,8 @@ using content::BrowserThread;
 namespace {
 
 const char kDefaultUrlScheme[] = "http://";
-const int64 kInvalidContentProviderId = 0;
-const int64 kInvalidBookmarkId = -1;
+const int64_t kInvalidContentProviderId = 0;
+const int64_t kInvalidBookmarkId = -1;
 
 // ------------- Java-related utility methods ------------- //
 
@@ -141,7 +144,7 @@ jboolean ConvertJBooleanObjectToPrimitive(JNIEnv* env, jobject boolean_object) {
 
 base::Time ConvertJlongToTime(jlong value) {
   return base::Time::UnixEpoch() +
-      base::TimeDelta::FromMilliseconds((int64)value);
+         base::TimeDelta::FromMilliseconds((int64_t)value);
 }
 
 jint ConvertJIntegerToJint(JNIEnv* env, jobject integer_obj) {
@@ -199,11 +202,11 @@ class AddBookmarkTask : public BookmarkModelTask {
  public:
   explicit AddBookmarkTask(BookmarkModel* model) : BookmarkModelTask(model) {}
 
-  int64 Run(const base::string16& title,
-            const base::string16& url,
-            const bool is_folder,
-            const int64 parent_id) {
-    int64 result = kInvalidBookmarkId;
+  int64_t Run(const base::string16& title,
+              const base::string16& url,
+              const bool is_folder,
+              const int64_t parent_id) {
+    int64_t result = kInvalidBookmarkId;
     RunOnUIThreadBlocking::Run(
         base::Bind(&AddBookmarkTask::RunOnUIThread,
                    model(), title, url, is_folder, parent_id, &result));
@@ -214,8 +217,8 @@ class AddBookmarkTask : public BookmarkModelTask {
                             const base::string16& title,
                             const base::string16& url,
                             const bool is_folder,
-                            const int64 parent_id,
-                            int64* result) {
+                            const int64_t parent_id,
+                            int64_t* result) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(result);
     GURL gurl = ParseAndMaybeAppendScheme(url, kDefaultUrlScheme);
@@ -251,14 +254,14 @@ class RemoveBookmarkTask : public BookmarkModelObserverTask {
         id_to_delete_(kInvalidBookmarkId) {}
   ~RemoveBookmarkTask() override {}
 
-  int Run(const int64 id) {
+  int Run(const int64_t id) {
     id_to_delete_ = id;
     RunOnUIThreadBlocking::Run(
         base::Bind(&RemoveBookmarkTask::RunOnUIThread, model(), id));
     return deleted_;
   }
 
-  static void RunOnUIThread(BookmarkModel* model, const int64 id) {
+  static void RunOnUIThread(BookmarkModel* model, const int64_t id) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
     if (node && node->parent())
@@ -277,7 +280,7 @@ class RemoveBookmarkTask : public BookmarkModelObserverTask {
 
  private:
   int deleted_;
-  int64 id_to_delete_;
+  int64_t id_to_delete_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveBookmarkTask);
 };
@@ -315,10 +318,10 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask {
         id_to_update_(kInvalidBookmarkId){}
   ~UpdateBookmarkTask() override {}
 
-  int Run(const int64 id,
+  int Run(const int64_t id,
           const base::string16& title,
           const base::string16& url,
-          const int64 parent_id) {
+          const int64_t parent_id) {
     id_to_update_ = id;
     RunOnUIThreadBlocking::Run(
         base::Bind(&UpdateBookmarkTask::RunOnUIThread,
@@ -327,10 +330,10 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask {
   }
 
   static void RunOnUIThread(BookmarkModel* model,
-                            const int64 id,
+                            const int64_t id,
                             const base::string16& title,
                             const base::string16& url,
-                            const int64 parent_id) {
+                            const int64_t parent_id) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
     if (node) {
@@ -363,7 +366,7 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask {
 
  private:
   int updated_;
-  int64 id_to_update_;
+  int64_t id_to_update_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateBookmarkTask);
 };
@@ -375,7 +378,7 @@ class BookmarkNodeExistsTask : public BookmarkModelTask {
       : BookmarkModelTask(model) {
   }
 
-  bool Run(const int64 id) {
+  bool Run(const int64_t id) {
     bool result = false;
     RunOnUIThreadBlocking::Run(
         base::Bind(&BookmarkNodeExistsTask::RunOnUIThread,
@@ -384,7 +387,7 @@ class BookmarkNodeExistsTask : public BookmarkModelTask {
   }
 
   static void RunOnUIThread(BookmarkModel* model,
-                            const int64 id,
+                            const int64_t id,
                             bool* result) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(result);
@@ -401,7 +404,7 @@ class IsInMobileBookmarksBranchTask : public BookmarkModelTask {
   explicit IsInMobileBookmarksBranchTask(BookmarkModel* model)
       : BookmarkModelTask(model) {}
 
-  bool Run(const int64 id) {
+  bool Run(const int64_t id) {
     bool result = false;
     RunOnUIThreadBlocking::Run(
         base::Bind(&IsInMobileBookmarksBranchTask::RunOnUIThread,
@@ -410,8 +413,8 @@ class IsInMobileBookmarksBranchTask : public BookmarkModelTask {
   }
 
   static void RunOnUIThread(BookmarkModel* model,
-                            const int64 id,
-                            bool *result) {
+                            const int64_t id,
+                            bool* result) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(result);
     const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
@@ -434,8 +437,8 @@ class CreateBookmarksFolderOnceTask : public BookmarkModelTask {
   explicit CreateBookmarksFolderOnceTask(BookmarkModel* model)
       : BookmarkModelTask(model) {}
 
-  int64 Run(const base::string16& title, const int64 parent_id) {
-    int64 result = kInvalidBookmarkId;
+  int64_t Run(const base::string16& title, const int64_t parent_id) {
+    int64_t result = kInvalidBookmarkId;
     RunOnUIThreadBlocking::Run(
         base::Bind(&CreateBookmarksFolderOnceTask::RunOnUIThread,
                    model(), title, parent_id, &result));
@@ -444,8 +447,8 @@ class CreateBookmarksFolderOnceTask : public BookmarkModelTask {
 
   static void RunOnUIThread(BookmarkModel* model,
                             const base::string16& title,
-                            const int64 parent_id,
-                            int64* result) {
+                            const int64_t parent_id,
+                            int64_t* result) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(result);
 
@@ -548,7 +551,7 @@ class GetBookmarkNodeTask : public BookmarkModelTask {
       : BookmarkModelTask(model) {
   }
 
-  void Run(const int64 id,
+  void Run(const int64_t id,
            bool get_parent,
            bool get_children,
            ScopedJavaGlobalRef<jobject>* jnode) {
@@ -558,7 +561,7 @@ class GetBookmarkNodeTask : public BookmarkModelTask {
   }
 
   static void RunOnUIThread(BookmarkModel* model,
-                            const int64 id,
+                            const int64_t id,
                             bool get_parent,
                             bool get_children,
                             ScopedJavaGlobalRef<jobject>* jnode) {
@@ -1115,7 +1118,7 @@ void FillBookmarkRow(JNIEnv* env,
         env, date)));
 
   if (favicon) {
-    std::vector<uint8> bytes;
+    std::vector<uint8_t> bytes;
     base::android::JavaByteArrayToByteVector(env, favicon, &bytes);
     row->set_favicon(base::RefCountedBytes::TakeVector(&bytes));
   }
diff --git a/chrome/browser/android/provider/chrome_browser_provider.h b/chrome/browser/android/provider/chrome_browser_provider.h
index 8549429..fabf3d4 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.h
+++ b/chrome/browser/android/provider/chrome_browser_provider.h
@@ -7,6 +7,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/android/recently_closed_tabs_bridge.h b/chrome/browser/android/recently_closed_tabs_bridge.h
index 3468862..1c0268d 100644
--- a/chrome/browser/android/recently_closed_tabs_bridge.h
+++ b/chrome/browser/android/recently_closed_tabs_bridge.h
@@ -9,6 +9,7 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/sessions/core/tab_restore_service_observer.h"
 
 class Profile;
diff --git a/chrome/browser/android/seccomp_support_detector.h b/chrome/browser/android/seccomp_support_detector.h
index d74e3fe..5f255b4 100644
--- a/chrome/browser/android/seccomp_support_detector.h
+++ b/chrome/browser/android/seccomp_support_detector.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_SECCOMP_SUPPORT_DETECTOR_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 
 // This class is used to report via UMA the Android kernel version and
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 2d39daf..6c85072 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -10,7 +10,6 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
diff --git a/chrome/browser/android/shortcut_helper.h b/chrome/browser/android/shortcut_helper.h
index 4dcbcb1..0292962 100644
--- a/chrome/browser/android/shortcut_helper.h
+++ b/chrome/browser/android/shortcut_helper.h
@@ -7,6 +7,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/macros.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/android/shortcut_info.h b/chrome/browser/android/shortcut_info.h
index e623932..fe1612c 100644
--- a/chrome/browser/android/shortcut_info.h
+++ b/chrome/browser/android/shortcut_info.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_
 #define CHROME_BROWSER_ANDROID_SHORTCUT_INFO_H_
 
+#include <stdint.h>
+
 #include "base/strings/string16.h"
 #include "content/public/common/manifest.h"
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
diff --git a/chrome/browser/android/shortcut_info_unittest.cc b/chrome/browser/android/shortcut_info_unittest.cc
index 2cb8359..86826ed 100644
--- a/chrome/browser/android/shortcut_info_unittest.cc
+++ b/chrome/browser/android/shortcut_info_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/shortcut_info.h"
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/manifest.h"
diff --git a/chrome/browser/android/signin/account_management_screen_helper.h b/chrome/browser/android/signin/account_management_screen_helper.h
index 8487848..c9019bc 100644
--- a/chrome/browser/android/signin/account_management_screen_helper.h
+++ b/chrome/browser/android/signin/account_management_screen_helper.h
@@ -7,7 +7,7 @@
 
 #include <jni.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 
 class Profile;
diff --git a/chrome/browser/android/signin/account_tracker_service_android.cc b/chrome/browser/android/signin/account_tracker_service_android.cc
index 7f01e4ee..27a5ea4 100644
--- a/chrome/browser/android/signin/account_tracker_service_android.cc
+++ b/chrome/browser/android/signin/account_tracker_service_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/signin/account_tracker_service_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_array.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index 54da285..bab368d 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -11,6 +11,7 @@
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/android/signin/signin_manager_android.h b/chrome/browser/android/signin/signin_manager_android.h
index dc4a13b..8659817 100644
--- a/chrome/browser/android/signin/signin_manager_android.h
+++ b/chrome/browser/android/signin/signin_manager_android.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.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/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 7f54e98..b67860c 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/tab_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -224,9 +226,8 @@ void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) {
         params->browser_initiated_post_data.get() &&
         params->browser_initiated_post_data.get()->size()) {
       jpost_data = ToJavaByteArray(
-          env,
-          reinterpret_cast<const uint8*>(
-              params->browser_initiated_post_data.get()->front()),
+          env, reinterpret_cast<const uint8_t*>(
+                   params->browser_initiated_post_data.get()->front()),
           params->browser_initiated_post_data.get()->size());
     }
     Java_Tab_openNewTab(env,
@@ -596,7 +597,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
     if (j_post_data) {
       load_params.load_type =
           content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
-      std::vector<uint8> post_data;
+      std::vector<uint8_t> post_data;
       base::android::JavaByteArrayToByteVector(env, j_post_data, &post_data);
       load_params.browser_initiated_post_data =
           base::RefCountedBytes::TakeVector(&post_data);
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index f15afa4..fa088e3 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -6,9 +6,11 @@
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
+#include <stdint.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/search/instant_service_observer.h"
diff --git a/chrome/browser/android/tab_state.cc b/chrome/browser/android/tab_state.cc
index 327bc8c..bd9ab3b 100644
--- a/chrome/browser/android/tab_state.cc
+++ b/chrome/browser/android/tab_state.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/android/tab_state.h"
 
 #include <jni.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <limits>
 #include <vector>
 
@@ -197,7 +199,7 @@ void UpgradeNavigationFromV1ToV2(
     if (iterator->ReadBool(&is_overriding_user_agent))
       v2_pickle.WriteBool(is_overriding_user_agent);
 
-    int64 timestamp_internal_value = 0;
+    int64_t timestamp_internal_value = 0;
     if (iterator->ReadInt64(&timestamp_internal_value))
       v2_pickle.WriteInt64(timestamp_internal_value);
 
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
index ba4b439..d2a1e48 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache.h b/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache.h
index 8629829..1bec4f1 100644
--- a/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache.h
+++ b/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache.h
@@ -5,6 +5,9 @@
 #ifndef CHROME_BROWSER_ANDROID_THUMBNAIL_SCOPED_PTR_EXPIRING_CACHE_H_
 #define CHROME_BROWSER_ANDROID_THUMBNAIL_SCOPED_PTR_EXPIRING_CACHE_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/linked_hash_map.h"
 
diff --git a/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc b/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc
index a9e48df..af382bc 100644
--- a/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc
+++ b/chrome/browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/android/thumbnail/scoped_ptr_expiring_cache.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/android/thumbnail/thumbnail.h b/chrome/browser/android/thumbnail/thumbnail.h
index 409dfd4..ed2a2dd 100644
--- a/chrome/browser/android/thumbnail/thumbnail.h
+++ b/chrome/browser/android/thumbnail/thumbnail.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_
 #define CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "cc/resources/ui_resource_bitmap.h"
diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.cc b/chrome/browser/android/thumbnail/thumbnail_cache.cc
index 381bbc3..7fc4d35 100644
--- a/chrome/browser/android/thumbnail/thumbnail_cache.cc
+++ b/chrome/browser/android/thumbnail/thumbnail_cache.cc
@@ -16,6 +16,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/android_opengl/etc1/etc1.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.h b/chrome/browser/android/thumbnail/thumbnail_cache.h
index 41de141..c1e47ec 100644
--- a/chrome/browser/android/thumbnail/thumbnail_cache.h
+++ b/chrome/browser/android/thumbnail/thumbnail_cache.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_CACHE_H_
 #define CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_CACHE_H_
 
+#include <stddef.h>
+
 #include <list>
 #include <set>
 #include <string>
@@ -12,6 +14,7 @@
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
index 54ef919..d3a2ce59 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h"
 
-#include "base/basictypes.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
index 58a3af6..f09d1a0 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/android/shortcut_info.h"
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
index 59a61e0..815957f 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
@@ -8,7 +8,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h
index d35bb02..3effb7b 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h
+++ b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h
@@ -7,7 +7,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h"
 #include "content/public/common/manifest.h"
diff --git a/chrome/browser/android/webapps/single_tab_mode_tab_helper.cc b/chrome/browser/android/webapps/single_tab_mode_tab_helper.cc
index 56db44f..6bb54cf 100644
--- a/chrome/browser/android/webapps/single_tab_mode_tab_helper.cc
+++ b/chrome/browser/android/webapps/single_tab_mode_tab_helper.cc
@@ -15,17 +15,17 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(SingleTabModeTabHelper);
 
 namespace {
 
-typedef std::pair<int32, int32> RenderWidgetHostID;
+typedef std::pair<int32_t, int32_t> RenderWidgetHostID;
 typedef std::set<RenderWidgetHostID> SingleTabIDSet;
 base::LazyInstance<SingleTabIDSet> g_blocked_ids = LAZY_INSTANCE_INITIALIZER;
 
-void AddPairOnIOThread(int32 process_id, int32 routing_id) {
+void AddPairOnIOThread(int32_t process_id, int32_t routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   RenderWidgetHostID single_tab_pair(process_id, routing_id);
   g_blocked_ids.Get().insert(single_tab_pair);
 }
 
-void RemovePairOnIOThread(int32 process_id, int32 routing_id) {
+void RemovePairOnIOThread(int32_t process_id, int32_t routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   RenderWidgetHostID single_tab_pair(process_id, routing_id);
   SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair);
@@ -37,8 +37,8 @@ void AddPair(content::RenderViewHost* render_view_host) {
   if (!render_view_host)
     return;
 
-  int32 process_id = render_view_host->GetProcess()->GetID();
-  int32 routing_id = render_view_host->GetRoutingID();
+  int32_t process_id = render_view_host->GetProcess()->GetID();
+  int32_t routing_id = render_view_host->GetRoutingID();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&AddPairOnIOThread, process_id, routing_id));
@@ -48,8 +48,8 @@ void RemovePair(content::RenderViewHost* render_view_host) {
   if (!render_view_host)
     return;
 
-  int32 process_id = render_view_host->GetProcess()->GetID();
-  int32 routing_id = render_view_host->GetRoutingID();
+  int32_t process_id = render_view_host->GetProcess()->GetID();
+  int32_t routing_id = render_view_host->GetRoutingID();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RemovePairOnIOThread, process_id, routing_id));
@@ -85,8 +85,8 @@ void SingleTabModeTabHelper::PermanentlyBlockAllNewWindows() {
   AddPair(web_contents()->GetRenderViewHost());
 }
 
-bool SingleTabModeTabHelper::IsRegistered(int32 process_id,
-                                          int32 routing_id) {
+bool SingleTabModeTabHelper::IsRegistered(int32_t process_id,
+                                          int32_t routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   RenderWidgetHostID single_tab_pair(process_id, routing_id);
   SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair);
diff --git a/chrome/browser/android/webapps/single_tab_mode_tab_helper.h b/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
index 744aee3..22ec40c 100644
--- a/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
+++ b/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
@@ -5,10 +5,12 @@
 #ifndef CHROME_BROWSER_ANDROID_WEBAPPS_SINGLE_TAB_MODE_TAB_HELPER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPPS_SINGLE_TAB_MODE_TAB_HELPER_H_
 
+#include <stdint.h>
+
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -28,7 +30,7 @@ class SingleTabModeTabHelper
       public content::WebContentsUserData<SingleTabModeTabHelper> {
  public:
   // Checks if the ID pair is blocked from creating new windows. IO-thread only.
-  static bool IsRegistered(int32 process_id, int32 routing_id);
+  static bool IsRegistered(int32_t process_id, int32_t routing_id);
 
   ~SingleTabModeTabHelper() override;
 
diff --git a/chrome/browser/android/webapps/webapp_registry.h b/chrome/browser/android/webapps/webapp_registry.h
index c54c2b9..26357bc 100644
--- a/chrome/browser/android/webapps/webapp_registry.h
+++ b/chrome/browser/android/webapps/webapp_registry.h
@@ -8,6 +8,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 
 // WebappRegistry is the C++ counterpart of
 // org.chromium.chrome.browser.webapp's WebappRegistry in Java.
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 56b78e5..26784c9 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -4,6 +4,8 @@
 
 #import "chrome/browser/app_controller_mac.h"
 
+#include <stddef.h>
+
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -11,6 +13,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index bd36bb6..d9b84cf 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -8,6 +8,7 @@
 #import <Foundation/NSAppleEventDescriptor.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
+#include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/app_mode/app_mode_utils.cc b/chrome/browser/app_mode/app_mode_utils.cc
index 14c37ba..787ac4a 100644
--- a/chrome/browser/app_mode/app_mode_utils.cc
+++ b/chrome/browser/app_mode/app_mode_utils.cc
@@ -4,9 +4,11 @@
 
 #include "chrome/browser/app_mode/app_mode_utils.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_switches.h"
 
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index ea0c629..fea6ecb 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -2,14 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "apps/launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/apps/app_browsertest_util.h b/chrome/browser/apps/app_browsertest_util.h
index e72d137..df758de 100644
--- a/chrome/browser/apps/app_browsertest_util.h
+++ b/chrome/browser/apps/app_browsertest_util.h
@@ -5,6 +5,9 @@
 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "extensions/browser/app_window/app_window.h"
 
diff --git a/chrome/browser/apps/app_launch_for_metro_restart_win.h b/chrome/browser/apps/app_launch_for_metro_restart_win.h
index a6296ab..b4e98e3 100644
--- a/chrome/browser/apps/app_launch_for_metro_restart_win.h
+++ b/chrome/browser/apps/app_launch_for_metro_restart_win.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 
 class PrefRegistrySimple;
 class Profile;
diff --git a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc
index 8b55be1..541e9f7 100644
--- a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc
+++ b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/apps/app_window_registry_util.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
index 9a79097..16f1ac4 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/common/mac/app_shim_messages.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
index 2018c98..38e9cb6 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
@@ -8,6 +8,7 @@
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_manager_mac.h b/chrome/browser/apps/app_shim/app_shim_host_manager_mac.h
index 47d2d9a..979f978 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_manager_mac.h
+++ b/chrome/browser/apps/app_shim/app_shim_host_manager_mac.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
 #define CHROME_BROWSER_APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/apps/app_shim/unix_domain_socket_acceptor.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
index 2e0a532a..1249e26 100644
--- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -14,10 +14,12 @@
 #include "base/mac/launch_services_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/test_timeouts.h"
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
index 74ae8c9..e4d20e4 100644
--- a/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "apps/switches.h"
+#include "base/macros.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
diff --git a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
index ec41323..0959fcd 100644
--- a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
+++ b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
@@ -8,6 +8,7 @@
 #include "apps/launcher.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h
index 5e2f902..4ef3f57 100644
--- a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h
+++ b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "apps/app_lifetime_monitor.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
diff --git a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
index 31fe992..58ec5c8 100644
--- a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
 #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h b/chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h
index 7e7dd3e..656ceee 100644
--- a/chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h
+++ b/chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_APPS_APP_SHIM_TEST_APP_SHIM_HOST_MANAGER_TEST_API_MAC_H
 #define CHROME_BROWSER_APPS_APP_SHIM_TEST_APP_SHIM_HOST_MANAGER_TEST_API_MAC_H
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 class AppShimHostManager;
diff --git a/chrome/browser/apps/app_shim/unix_domain_socket_acceptor.h b/chrome/browser/apps/app_shim/unix_domain_socket_acceptor.h
index a402178f..0d7071f 100644
--- a/chrome/browser/apps/app_shim/unix_domain_socket_acceptor.h
+++ b/chrome/browser/apps/app_shim/unix_domain_socket_acceptor.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_APPS_APP_SHIM_UNIX_DOMAIN_SOCKET_ACCEPTOR_H_
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "ipc/ipc_channel_handle.h"
 
diff --git a/chrome/browser/apps/app_speech_recognition_browsertest.cc b/chrome/browser/apps/app_speech_recognition_browsertest.cc
index 685510c..085529e 100644
--- a/chrome/browser/apps/app_speech_recognition_browsertest.cc
+++ b/chrome/browser/apps/app_speech_recognition_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/fake_speech_recognition_manager.h"
diff --git a/chrome/browser/apps/app_url_redirector.h b/chrome/browser/apps/app_url_redirector.h
index 629af37..399e51d 100644
--- a/chrome/browser/apps/app_url_redirector.h
+++ b/chrome/browser/apps/app_url_redirector.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_APPS_APP_URL_REDIRECTOR_H_
 #define CHROME_BROWSER_APPS_APP_URL_REDIRECTOR_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/navigation_throttle.h"
 
diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc
index 1d18ba9..b4ca00c 100644
--- a/chrome/browser/apps/app_url_redirector_browsertest.cc
+++ b/chrome/browser/apps/app_url_redirector_browsertest.cc
@@ -5,6 +5,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc
index f498e37..b85606b 100644
--- a/chrome/browser/apps/app_window_browsertest.cc
+++ b/chrome/browser/apps/app_window_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc
index fa7d6d7..8af143a 100644
--- a/chrome/browser/apps/app_window_interactive_uitest.cc
+++ b/chrome/browser/apps/app_window_interactive_uitest.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 "base/macros.h"
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser_iterator.h"
diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index 78bd9d7..974dfa0 100644
--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
@@ -6,7 +6,9 @@
 
 #include "ash/shell.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_service_views.h"
diff --git a/chrome/browser/apps/drive/drive_app_converter.cc b/chrome/browser/apps/drive/drive_app_converter.cc
index fe3b611..fb20f05 100644
--- a/chrome/browser/apps/drive/drive_app_converter.cc
+++ b/chrome/browser/apps/drive/drive_app_converter.cc
@@ -4,11 +4,14 @@
 
 #include "chrome/browser/apps/drive/drive_app_converter.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <set>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
diff --git a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc
index 11df12d..840fd2a 100644
--- a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc
+++ b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/version.h"
diff --git a/chrome/browser/apps/drive/drive_app_mapping.cc b/chrome/browser/apps/drive/drive_app_mapping.cc
index 78058f4..ab46c6d 100644
--- a/chrome/browser/apps/drive/drive_app_mapping.cc
+++ b/chrome/browser/apps/drive/drive_app_mapping.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/apps/drive/drive_app_mapping.h"
 
+#include <stddef.h>
+
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/values.h"
diff --git a/chrome/browser/apps/drive/drive_app_provider.cc b/chrome/browser/apps/drive/drive_app_provider.cc
index 06f31a1..380bcd4 100644
--- a/chrome/browser/apps/drive/drive_app_provider.cc
+++ b/chrome/browser/apps/drive/drive_app_provider.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/apps/drive/drive_app_provider.h"
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/bind.h"
diff --git a/chrome/browser/apps/drive/drive_service_bridge.cc b/chrome/browser/apps/drive/drive_service_bridge.cc
index 916bcd5e..e45c4a7 100644
--- a/chrome/browser/apps/drive/drive_service_bridge.cc
+++ b/chrome/browser/apps/drive/drive_service_bridge.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
diff --git a/chrome/browser/apps/guest_view/app_view_browsertest.cc b/chrome/browser/apps/guest_view/app_view_browsertest.cc
index 888cad2..ac2206b 100644
--- a/chrome/browser/apps/guest_view/app_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/app_view_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "components/guest_view/browser/guest_view_manager.h"
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index e12d457..adea863 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -5,12 +5,14 @@
 #include <queue>
 
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
index 5f75384..1813cb9 100644
--- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
@@ -2,11 +2,15 @@
 // 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/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
diff --git a/chrome/browser/apps/install_chrome_app.cc b/chrome/browser/apps/install_chrome_app.cc
index 167e8d5..801684c 100644
--- a/chrome/browser/apps/install_chrome_app.cc
+++ b/chrome/browser/apps/install_chrome_app.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/apps/install_chrome_app.h"
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/webstore_install_with_prompt.h"
diff --git a/chrome/browser/apps/per_app_settings_service.h b/chrome/browser/apps/per_app_settings_service.h
index c65ed3e..86fc086 100644
--- a/chrome/browser/apps/per_app_settings_service.h
+++ b/chrome/browser/apps/per_app_settings_service.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "components/keyed_service/core/keyed_service.h"
 
diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc
index 884a5d9..af9c906 100644
--- a/chrome/browser/apps/shortcut_manager.cc
+++ b/chrome/browser/apps/shortcut_manager.cc
@@ -10,6 +10,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/apps/shortcut_manager.h b/chrome/browser/apps/shortcut_manager.h
index a6dcde91..c261b65 100644
--- a/chrome/browser/apps/shortcut_manager.h
+++ b/chrome/browser/apps/shortcut_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_APPS_SHORTCUT_MANAGER_H_
 #define CHROME_BROWSER_APPS_SHORTCUT_MANAGER_H_
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 5046dff..00cecb7 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -2,10 +2,13 @@
 // 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/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.h b/chrome/browser/autocomplete/autocomplete_classifier_factory.h
index 1e2f04a..1bfc755 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier_factory.h
+++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CLASSIFIER_FACTORY_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CLASSIFIER_FACTORY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
index 4d4230a..24ef8a5 100644
--- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc
+++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
@@ -4,10 +4,13 @@
 
 #include "components/omnibox/browser/bookmark_provider.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc
index 906c6e0..988c2c6 100644
--- a/chrome/browser/autocomplete/builtin_provider_unittest.cc
+++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc
@@ -4,9 +4,13 @@
 
 #include "components/omnibox/browser/builtin_provider.h"
 
+#include <stddef.h>
+
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
index 9619469..6c71857 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -4,8 +4,12 @@
 
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
index e8b218a..e7b85a4 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_CHROME_AUTOCOMPLETE_PROVIDER_CLIENT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_CHROME_AUTOCOMPLETE_PROVIDER_CLIENT_H_
 
+#include "base/macros.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "components/omnibox/browser/autocomplete_provider_client.h"
diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
index 8fcc210..166813d 100644
--- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "components/omnibox/browser/history_quick_provider.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <functional>
 #include <set>
@@ -11,6 +13,7 @@
 #include <vector>
 
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index 1fc0ae8..d4122f8 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -4,8 +4,11 @@
 
 #include "components/omnibox/browser/history_url_provider.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
index 173c949..b47939e 100644
--- a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
+++ b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <fstream>
 
@@ -10,6 +13,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/case_conversion.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
@@ -278,7 +282,7 @@ void InMemoryURLIndexTest::SetUp() {
       history::URLRow row;
       history_database_->FillURLRow(statement, &row);
       base::Time last_visit = time_right_now;
-      for (int64 i = row.last_visit().ToInternalValue(); i > 0; --i)
+      for (int64_t i = row.last_visit().ToInternalValue(); i > 0; --i)
         last_visit -= day_delta;
       row.set_last_visit(last_visit);
       history_database_->UpdateURLRow(row.id(), row);
@@ -298,7 +302,7 @@ void InMemoryURLIndexTest::SetUp() {
       history::VisitRow row;
       history_database_->FillVisitRow(statement, &row);
       base::Time last_visit = time_right_now;
-      for (int64 i = row.visit_time.ToInternalValue(); i > 0; --i)
+      for (int64_t i = row.visit_time.ToInternalValue(); i > 0; --i)
         last_visit -= day_delta;
       row.visit_time = last_visit;
       history_database_->UpdateVisitRow(row);
@@ -488,7 +492,7 @@ TEST_F(LimitedInMemoryURLIndexTest, Initialization) {
   // is the pre-filtered count, i.e. all of the items.
   sql::Statement statement(GetDB().GetUniqueStatement("SELECT * FROM urls;"));
   ASSERT_TRUE(statement.is_valid());
-  uint64 row_count = 0;
+  uint64_t row_count = 0;
   while (statement.Step()) ++row_count;
   EXPECT_EQ(1U, row_count);
 
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
index e4788f7..7330149a 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
 
+#include <stddef.h>
+
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
index 047224f..405cb05 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider_listener.h"
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
index 19ee5448..16236b7 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index e1e82f8..ca5a6db 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "components/omnibox/browser/search_provider.h"
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
index 1ccc1b5..ce66d83 100644
--- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
@@ -4,7 +4,10 @@
 
 #include "components/omnibox/browser/shortcuts_backend.h"
 
+#include <stddef.h>
+
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/autocomplete/shortcuts_extensions_manager.h b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
index e29c765..13e645b 100644
--- a/chrome/browser/autocomplete/shortcuts_extensions_manager.h
+++ b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_EXTENSIONS_MANAGER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_EXTENSIONS_MANAGER_H_
 
+#include "base/macros.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 01e7c73..484e5d4 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -5,6 +5,7 @@
 #include "components/omnibox/browser/shortcuts_provider.h"
 
 #include <math.h>
+#include <stddef.h>
 
 #include <algorithm>
 #include <functional>
@@ -12,6 +13,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 3cd6d8a..e913975 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
 
+#include <stddef.h>
+
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.h b/chrome/browser/autofill/android/personal_data_manager_android.h
index 9e9882f..61a86b7 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.h
+++ b/chrome/browser/autofill/android/personal_data_manager_android.h
@@ -7,6 +7,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index e975412..03902d7 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
@@ -16,6 +17,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
index 2dc1fa5..9786659 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 51f13be..f1392f9 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -4,9 +4,9 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
@@ -15,6 +15,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/autofill/autofill_uitest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/autofill/autofill_uitest_util.cc b/chrome/browser/autofill/autofill_uitest_util.cc
index 957db37..1bdfa0e 100644
--- a/chrome/browser/autofill/autofill_uitest_util.cc
+++ b/chrome/browser/autofill/autofill_uitest_util.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "chrome/browser/autofill/autofill_uitest_util.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
index 22ab2bc..3c4eefb 100644
--- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc
+++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index 52bcb4d..8950d0b 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -7,9 +7,11 @@
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/autofill/risk_util.cc b/chrome/browser/autofill/risk_util.cc
index 0217fd9..fa80963 100644
--- a/chrome/browser/autofill/risk_util.cc
+++ b/chrome/browser/autofill/risk_util.cc
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_window_registry_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/autofill/validation_rules_storage_factory.h b/chrome/browser/autofill/validation_rules_storage_factory.h
index cc4b9c3..0c2e503 100644
--- a/chrome/browser/autofill/validation_rules_storage_factory.h
+++ b/chrome/browser/autofill/validation_rules_storage_factory.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_AUTOFILL_VALIDATION_RULES_STORAGE_FACTORY_H_
 #define CHROME_BROWSER_AUTOFILL_VALIDATION_RULES_STORAGE_FACTORY_H_
 
-#include "base/basictypes.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index b145e5e..282cf45 100644
--- a/chrome/browser/background/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.h
@@ -5,10 +5,12 @@
 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_APPLICATION_LIST_MODEL_H_
 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_APPLICATION_LIST_MODEL_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 35e99e9..29e68d5 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -4,6 +4,8 @@
 
 // TODO(rickcam): Bug 73183: Add unit tests for image loading
 
+#include <stddef.h>
+
 #include <cstdlib>
 #include <set>
 
@@ -14,6 +16,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
+#include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/permissions_updater.h"
diff --git a/chrome/browser/background/background_contents.h b/chrome/browser/background/background_contents.h
index c6ec4c1..4e14d14 100644
--- a/chrome/browser/background/background_contents.h
+++ b/chrome/browser/background/background_contents.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_
 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_
 
+#include <stdint.h>
+
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index d5b14d9..e48800a 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/background/background_contents_service.h"
 
 #include "apps/app_load_service.h"
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index f122682..045fa2c 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -5,11 +5,14 @@
 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/background/background_contents.h"
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index 655379b..9a081b7 100644
--- a/chrome/browser/background/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -4,13 +4,14 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/background/background_contents.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index d7d18bb..81af590 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/background/background_mode_manager.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 #include <vector>
@@ -20,6 +22,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_application_list_model.h"
 #include "chrome/browser/background/background_trigger.h"
diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h
index 8ced6a7..b796567 100644
--- a/chrome/browser/background/background_mode_manager.h
+++ b/chrome/browser/background/background_mode_manager.h
@@ -11,6 +11,7 @@
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
index 757fc1c..21b2c26 100644
--- a/chrome/browser/background/background_mode_manager_unittest.cc
+++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -2,13 +2,17 @@
 // 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/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/background/background_trigger.h"
 #include "chrome/browser/browser_shutdown.h"
diff --git a/chrome/browser/background_sync/background_sync_controller_factory.h b/chrome/browser/background_sync/background_sync_controller_factory.h
index b93dbe9..c2a10dd 100644
--- a/chrome/browser/background_sync/background_sync_controller_factory.h
+++ b/chrome/browser/background_sync/background_sync_controller_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTROLLER_FACTORY_H_
 #define CHROME_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTROLLER_FACTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
diff --git a/chrome/browser/background_sync/background_sync_controller_impl.h b/chrome/browser/background_sync/background_sync_controller_impl.h
index 02cd41f..b8b6735 100644
--- a/chrome/browser/background_sync/background_sync_controller_impl.h
+++ b/chrome/browser/background_sync/background_sync_controller_impl.h
@@ -7,6 +7,9 @@
 
 #include "content/public/browser/background_sync_controller.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_thread.h"
 
diff --git a/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc b/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc
index 3467c73..a0fc6f6 100644
--- a/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc
+++ b/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/background_sync/background_sync_controller_impl.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/rappor/test_rappor_service.h"
 #include "components/variations/variations_associated_data.h"
@@ -124,7 +127,7 @@ TEST_F(BackgroundSyncControllerImplTest, AllParamsSet) {
   field_parameters
       [BackgroundSyncControllerImpl::kRetryDelayFactorParameterName] = "300";
   field_parameters[BackgroundSyncControllerImpl::kMinSyncRecoveryTimeName] =
-      "8000000000000";  // something larger than int32.
+      "8000000000000";  // something larger than int32_t.
   ASSERT_TRUE(variations::AssociateVariationParams(
       BackgroundSyncControllerImpl::kFieldTrialName, kFieldTrialGroup,
       field_parameters));
diff --git a/chrome/browser/banners/app_banner_data_fetcher.h b/chrome/browser/banners/app_banner_data_fetcher.h
index a1cdc22..24236a1 100644
--- a/chrome/browser/banners/app_banner_data_fetcher.h
+++ b/chrome/browser/banners/app_banner_data_fetcher.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/banners/app_banner_data_fetcher_desktop.h b/chrome/browser/banners/app_banner_data_fetcher_desktop.h
index ed2e927..1915e880 100644
--- a/chrome/browser/banners/app_banner_data_fetcher_desktop.h
+++ b/chrome/browser/banners/app_banner_data_fetcher_desktop.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_DESKTOP_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_DESKTOP_H_
 
+#include "base/macros.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 
 namespace extensions {
diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
index e718bc9..ca913eb 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/banners/app_banner_infobar_delegate_desktop.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/banners/app_banner_data_fetcher_desktop.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
index 854eb88..c6b332b 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_INFOBAR_DELEGATE_DESKTOP_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_INFOBAR_DELEGATE_DESKTOP_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/banners/app_banner_manager.h b/chrome/browser/banners/app_banner_manager.h
index 19dcc32..c11b4cb 100644
--- a/chrome/browser/banners/app_banner_manager.h
+++ b/chrome/browser/banners/app_banner_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc
index 02e3894..d3aa3bf 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
 
 #include "base/command_line.h"
+#include "build/build_config.h"
 #include "chrome/browser/banners/app_banner_data_fetcher_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "extensions/common/constants.h"
diff --git a/chrome/browser/banners/app_banner_manager_desktop.h b/chrome/browser/banners/app_banner_manager_desktop.h
index 3db9508a..fc40997 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.h
+++ b/chrome/browser/banners/app_banner_manager_desktop.h
@@ -7,6 +7,7 @@
 
 #include "chrome/browser/banners/app_banner_manager.h"
 
+#include "base/macros.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace banners {
diff --git a/chrome/browser/banners/app_banner_settings_helper.cc b/chrome/browser/banners/app_banner_settings_helper.cc
index 2f0bb43..e4e6755 100644
--- a/chrome/browser/banners/app_banner_settings_helper.cc
+++ b/chrome/browser/banners/app_banner_settings_helper.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
index 9d3aa52..3e928c0 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_H_
 #define CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
 #include "chrome/browser/image_decoder.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
index e149d75..27b322d 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h
index 2551135..8956153 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_DELEGATE_H_
 #define CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_DELEGATE_H_
 
+#include "base/macros.h"
 #include "url/gurl.h"
 
 class SkBitmap;
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
index f51651b..cb45d16 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
index a6bf8ba..13aa938 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/containers/mru_cache.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
index a83f716..87cd13b 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_FACTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc
index f4f780a..7ba9458 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index a7e5895..5638549 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -4,11 +4,15 @@
 
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -236,7 +240,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
   // Converts a time string written to the JSON codec into a time_t string
   // (used by bookmarks.html) and writes it.
   bool WriteTime(const std::string& time_string) {
-    int64 internal_value;
+    int64_t internal_value;
     base::StringToInt64(time_string, &internal_value);
     return Write(base::Int64ToString(
         base::Time::FromInternalValue(internal_value).ToTimeT()));
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index 36330bf..00c540d 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 362b098..9f28dcc 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -4,8 +4,12 @@
 
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/time_formatting.h"
+#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index faef18c..341829c 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -9,6 +9,7 @@
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/bookmarks/startup_task_runner_service_factory.h"
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
index 068aa2c..afe3bc4 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.h b/chrome/browser/bookmarks/startup_task_runner_service_factory.h
index 9450e41..acf25a5 100644
--- a/chrome/browser/bookmarks/startup_task_runner_service_factory.h
+++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_STARTUP_TASK_RUNNER_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_BOOKMARKS_STARTUP_TASK_RUNNER_SERVICE_FACTORY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index d4a581a..be6f107 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -12,6 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index b904287..fdcd740 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_about_handler.h"
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index b87eb89..2c39bbb 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser_command_controller.h"
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index 99820d3..e6d60a7 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -2,10 +2,14 @@
 // 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/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
+#include "build/build_config.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 73c85e0..36baea1 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -4,8 +4,10 @@
 
 #include "build/build_config.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 4bbe46a..a93fabf 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -10,10 +10,13 @@
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/host_desktop.h"
@@ -182,7 +185,7 @@ class BrowserProcess {
   virtual void CreateDevToolsHttpProtocolHandler(
       chrome::HostDesktopType host_desktop_type,
       const std::string& ip,
-      uint16 port) = 0;
+      uint16_t port) = 0;
 
   virtual unsigned int AddRefModule() = 0;
   virtual unsigned int ReleaseModule() = 0;
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 467f552..8c669f8 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/browser_process_impl.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <map>
 #include <vector>
@@ -15,6 +17,7 @@
 #include "base/debug/alias.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
@@ -26,6 +29,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/default_tick_clock.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_child_process_watcher.h"
 #include "chrome/browser/chrome_content_browser_client.h"
@@ -673,7 +677,7 @@ GpuModeManager* BrowserProcessImpl::gpu_mode_manager() {
 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
     chrome::HostDesktopType host_desktop_type,
     const std::string& ip,
-    uint16 port) {
+    uint16_t port) {
   DCHECK(CalledOnValidThread());
 #if !defined(OS_ANDROID)
   // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index bc59331..781c65b 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -10,15 +10,18 @@
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 
 class ChromeChildProcessWatcher;
@@ -109,7 +112,7 @@ class BrowserProcessImpl : public BrowserProcess,
   void CreateDevToolsHttpProtocolHandler(
       chrome::HostDesktopType host_desktop_type,
       const std::string& ip,
-      uint16 port) override;
+      uint16_t port) override;
   unsigned int AddRefModule() override;
   unsigned int ReleaseModule() override;
   bool IsShuttingDown() override;
diff --git a/chrome/browser/browser_process_impl_unittest.cc b/chrome/browser/browser_process_impl_unittest.cc
index 2949c60..b86f2e7 100644
--- a/chrome/browser/browser_process_impl_unittest.cc
+++ b/chrome/browser/browser_process_impl_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/browser_process_platform_part_android.h b/chrome/browser/browser_process_platform_part_android.h
index 9f8ee3c..0c2343c 100644
--- a/chrome/browser/browser_process_platform_part_android.h
+++ b/chrome/browser/browser_process_platform_part_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_ANDROID_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/browser_process_platform_part_base.h"
 
 class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
diff --git a/chrome/browser/browser_process_platform_part_aurawin.h b/chrome/browser/browser_process_platform_part_aurawin.h
index 8063f26..06dec47 100644
--- a/chrome/browser/browser_process_platform_part_aurawin.h
+++ b/chrome/browser/browser_process_platform_part_aurawin.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_AURAWIN_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process_platform_part_base.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/browser_process_platform_part_base.cc b/chrome/browser/browser_process_platform_part_base.cc
index ea65af3..8e56a0e 100644
--- a/chrome/browser/browser_process_platform_part_base.cc
+++ b/chrome/browser/browser_process_platform_part_base.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process_platform_part_base.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 
diff --git a/chrome/browser/browser_process_platform_part_base.h b/chrome/browser/browser_process_platform_part_base.h
index 6ae847f..c64ea5c 100644
--- a/chrome/browser/browser_process_platform_part_base.h
+++ b/chrome/browser/browser_process_platform_part_base.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_BASE_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_BASE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
diff --git a/chrome/browser/browser_process_platform_part_chromeos.h b/chrome/browser/browser_process_platform_part_chromeos.h
index a067b51..11eed8e 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.h
+++ b/chrome/browser/browser_process_platform_part_chromeos.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_CHROMEOS_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/browser_process_platform_part_base.h"
diff --git a/chrome/browser/browser_process_platform_part_mac.h b/chrome/browser/browser_process_platform_part_mac.h
index d78ee99..d60a44b 100644
--- a/chrome/browser/browser_process_platform_part_mac.h
+++ b/chrome/browser/browser_process_platform_part_mac.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_MAC_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 #include "chrome/browser/browser_process_platform_part_base.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 9062d30..e8abbe6 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/browser_shutdown.h"
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
@@ -19,6 +21,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/browser_shutdown.h b/chrome/browser/browser_shutdown.h
index 080a4b1..c345032 100644
--- a/chrome/browser/browser_shutdown.h
+++ b/chrome/browser/browser_shutdown.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_BROWSER_SHUTDOWN_H_
 #define CHROME_BROWSER_BROWSER_SHUTDOWN_H_
 
+#include "build/build_config.h"
+
 class PrefRegistrySimple;
 
 namespace browser_shutdown {
diff --git a/chrome/browser/browsing_data/autofill_counter_browsertest.cc b/chrome/browser/browsing_data/autofill_counter_browsertest.cc
index 0e1e7c8..79f83ef 100644
--- a/chrome/browser/browsing_data/autofill_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/autofill_counter_browsertest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/browsing_data/autofill_counter.h"
 
 #include "base/guid.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.h b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
index 15d1797..ce35247 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_APPCACHE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_APPCACHE_HELPER_H_
 
+#include <stddef.h>
+
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/appcache_service.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
index 80cec24..96b7c5a 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/browsing_data/browsing_data_cache_storage_helper.cc b/chrome/browser/browsing_data/browsing_data_cache_storage_helper.cc
index d6bcbe1..72483ab 100644
--- a/chrome/browser/browsing_data/browsing_data_cache_storage_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cache_storage_helper.cc
@@ -80,7 +80,7 @@ void BrowsingDataCacheStorageHelper::DeleteCacheStorageOnIOThread(
 
 CannedBrowsingDataCacheStorageHelper::PendingCacheStorageUsageInfo::
     PendingCacheStorageUsageInfo(const GURL& origin,
-                                 int64 total_size_bytes,
+                                 int64_t total_size_bytes,
                                  const base::Time& last_modified)
     : origin(origin),
       total_size_bytes(total_size_bytes),
diff --git a/chrome/browser/browsing_data/browsing_data_cache_storage_helper.h b/chrome/browser/browsing_data/browsing_data_cache_storage_helper.h
index 117ed6f..66c9186 100644
--- a/chrome/browser/browsing_data/browsing_data_cache_storage_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_cache_storage_helper.h
@@ -5,10 +5,14 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_CACHE_STORAGE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_CACHE_STORAGE_HELPER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <list>
 #include <set>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/public/browser/cache_storage_context.h"
@@ -64,14 +68,14 @@ class CannedBrowsingDataCacheStorageHelper
   // Contains information about a Cache Storage.
   struct PendingCacheStorageUsageInfo {
     PendingCacheStorageUsageInfo(const GURL& origin,
-                                 int64 total_size_bytes,
+                                 int64_t total_size_bytes,
                                  const base::Time& last_modified);
     ~PendingCacheStorageUsageInfo();
 
     bool operator<(const PendingCacheStorageUsageInfo& other) const;
 
     GURL origin;
-    int64 total_size_bytes;
+    int64_t total_size_bytes;
     base::Time last_modified;
   };
 
diff --git a/chrome/browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc
index d563476..24865dd 100644
--- a/chrome/browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/browsing_data/browsing_data_channel_id_helper.cc b/chrome/browser/browsing_data/browsing_data_channel_id_helper.cc
index 2f76beb..73eccc1 100644
--- a/chrome/browser/browsing_data/browsing_data_channel_id_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_channel_id_helper.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/browsing_data/browsing_data_channel_id_helper.h b/chrome/browser/browsing_data/browsing_data_channel_id_helper.h
index 448cae3..57d53a0 100644
--- a/chrome/browser/browsing_data/browsing_data_channel_id_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_channel_id_helper.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_CHANNEL_ID_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_CHANNEL_ID_HELPER_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "net/ssl/channel_id_store.h"
 
 namespace net {
diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.h b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
index b176399..5366a0f 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
@@ -5,11 +5,13 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browsing_data/canonical_cookie_hash.h"
 #include "net/cookies/cookie_monster.h"
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper.cc b/chrome/browser/browsing_data/browsing_data_database_helper.cc
index 7028067..219be90 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.cc
@@ -29,14 +29,13 @@ BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo(
     const DatabaseIdentifier& identifier,
     const std::string& database_name,
     const std::string& description,
-    int64 size,
+    int64_t size,
     base::Time last_modified)
     : identifier(identifier),
       database_name(database_name),
       description(description),
       size(size),
-      last_modified(last_modified) {
-}
+      last_modified(last_modified) {}
 
 BrowsingDataDatabaseHelper::DatabaseInfo::~DatabaseInfo() {}
 
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper.h b/chrome/browser/browsing_data/browsing_data_database_helper.h
index c5cdb18..e0565d3 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <list>
 #include <set>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "storage/browser/database/database_tracker.h"
@@ -32,14 +35,14 @@ class BrowsingDataDatabaseHelper
     DatabaseInfo(const storage::DatabaseIdentifier& identifier,
                  const std::string& database_name,
                  const std::string& description,
-                 int64 size,
+                 int64_t size,
                  base::Time last_modified);
     ~DatabaseInfo();
 
     storage::DatabaseIdentifier identifier;
     std::string database_name;
     std::string description;
-    int64 size;
+    int64_t size;
     base::Time last_modified;
   };
 
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index e6ddc59..20db697 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
@@ -35,7 +37,7 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
             ->GetDatabaseTracker();
     base::string16 db_name = base::ASCIIToUTF16("db");
     base::string16 description = base::ASCIIToUTF16("db_description");
-    int64 size;
+    int64_t size;
     db_tracker->DatabaseOpened(kTestIdentifier1, db_name, description,
                                1, &size);
     db_tracker->DatabaseClosed(kTestIdentifier1, db_name);
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
index 72c50a6..f1ee3d8 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
@@ -116,7 +117,7 @@ void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread(
     for (const GURL& current : origins) {
       if (!BrowsingDataHelper::HasWebScheme(current))
         continue;  // Non-websafe state is not considered browsing data.
-      int64 usage = quota_util->GetOriginUsageOnFileTaskRunner(
+      int64_t usage = quota_util->GetOriginUsageOnFileTaskRunner(
           filesystem_context_.get(), current, type);
       OriginInfoMap::iterator inserted =
           file_system_info_map.insert(
@@ -160,7 +161,7 @@ CannedBrowsingDataFileSystemHelper::~CannedBrowsingDataFileSystemHelper() {}
 void CannedBrowsingDataFileSystemHelper::AddFileSystem(
     const GURL& origin,
     const storage::FileSystemType type,
-    const int64 size) {
+    const int64_t size) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // This canned implementation of AddFileSystem uses an O(n^2) algorithm; which
   // is fine, as it isn't meant for use in a high-volume context. If it turns
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.h b/chrome/browser/browsing_data/browsing_data_file_system_helper.h
index ddf4917..0f2066a 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.h
@@ -5,10 +5,14 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <list>
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "url/gurl.h"
@@ -45,7 +49,7 @@ class BrowsingDataFileSystemHelper
     // The origin for which the information is relevant.
     GURL origin;
     // FileSystemType to usage (in bytes) map.
-    std::map<storage::FileSystemType, int64> usage_map;
+    std::map<storage::FileSystemType, int64_t> usage_map;
   };
 
   using FetchCallback = base::Callback<void(const std::list<FileSystemInfo>&)>;
@@ -97,7 +101,7 @@ class CannedBrowsingDataFileSystemHelper
   // each file system type).
   void AddFileSystem(const GURL& origin,
                      storage::FileSystemType type,
-                     int64 size);
+                     int64_t size);
 
   // Clear this helper's list of canned filesystems.
   void Reset();
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
index 7b57261..ceb8dd2 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
@@ -4,9 +4,12 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc b/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc
index d6a0fdb..baeb4bd 100644
--- a/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc
@@ -4,11 +4,14 @@
 
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 
+#include <stdint.h>
+
 #include <limits>
 #include <map>
 
 #include "base/callback.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 
 namespace {
@@ -26,9 +29,9 @@ class BrowsingDataFlashLSOHelperImpl
 
   // PepperFlashSettingsManager::Client overrides:
   void OnGetSitesWithDataCompleted(
-      uint32 request_id,
+      uint32_t request_id,
       const std::vector<std::string>& sites) override;
-  void OnClearSiteDataCompleted(uint32 request_id, bool success) override;
+  void OnClearSiteDataCompleted(uint32_t request_id, bool success) override;
 
  private:
   ~BrowsingDataFlashLSOHelperImpl() override;
@@ -37,11 +40,11 @@ class BrowsingDataFlashLSOHelperImpl
   PepperFlashSettingsManager settings_manager_;
 
   // Identifies the request to fetch site data.
-  uint32 get_sites_with_data_request_id_;
+  uint32_t get_sites_with_data_request_id_;
 
   // Contains the pending requests to clear site data. The key is the request
   // ID, the value the site for which to clear data.
-  std::map<uint32, std::string> clear_site_data_ids_;
+  std::map<uint32_t, std::string> clear_site_data_ids_;
 
   // Called when we have fetched the list of sites.
   GetSitesWithFlashDataCallback callback_;
@@ -67,23 +70,24 @@ void BrowsingDataFlashLSOHelperImpl::StartFetching(
 
 void BrowsingDataFlashLSOHelperImpl::DeleteFlashLSOsForSite(
     const std::string& site) {
-  const uint64 kClearAllData = 0;
-  uint32 id = settings_manager_.ClearSiteData(
-      site, kClearAllData, std::numeric_limits<uint64>::max());
+  const uint64_t kClearAllData = 0;
+  uint32_t id = settings_manager_.ClearSiteData(
+      site, kClearAllData, std::numeric_limits<uint64_t>::max());
   clear_site_data_ids_[id] = site;
 }
 
 void BrowsingDataFlashLSOHelperImpl::OnGetSitesWithDataCompleted(
-    uint32 request_id,
+    uint32_t request_id,
     const std::vector<std::string>& sites) {
   DCHECK_EQ(get_sites_with_data_request_id_, request_id);
   callback_.Run(sites);
   callback_ = GetSitesWithFlashDataCallback();
 }
 
-void BrowsingDataFlashLSOHelperImpl::OnClearSiteDataCompleted(uint32 request_id,
-                                                              bool success) {
-  std::map<uint32, std::string>::iterator entry =
+void BrowsingDataFlashLSOHelperImpl::OnClearSiteDataCompleted(
+    uint32_t request_id,
+    bool success) {
+  std::map<uint32_t, std::string>::iterator entry =
       clear_site_data_ids_.find(request_id);
   DCHECK(entry != clear_site_data_ids_.end());
   LOG_IF(ERROR, !success) << "Couldn't clear Flash LSO data for "
diff --git a/chrome/browser/browsing_data/browsing_data_helper.h b/chrome/browser/browsing_data/browsing_data_helper.h
index fd88d95..780a62d0 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_helper.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace storage {
 class SpecialStoragePolicy;
diff --git a/chrome/browser/browsing_data/browsing_data_helper_browsertest.h b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
index 29a82881..f93cec2 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
+++ b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
@@ -9,8 +9,8 @@
 
 #include <list>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 
 // This template can be used for the StartFetching methods of the browsing data
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index 8dcb420..401bb32 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/constants.h"
diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
index 9119cb4..133f6d6 100644
--- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_INDEXED_DB_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_INDEXED_DB_HELPER_H_
 
+#include <stddef.h>
+
 #include <list>
 #include <set>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/indexed_db_context.h"
diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
index 5f785c0..2562edc 100644
--- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
index 76943dd..c9dc1d0 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
@@ -42,7 +42,7 @@ void GetUsageInfoCallback(
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::LocalStorageInfo(
     const GURL& origin_url,
-    int64 size,
+    int64_t size,
     base::Time last_modified)
     : origin_url(origin_url), size(size), last_modified(last_modified) {}
 
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h
index d279bbb..47f12f57 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <list>
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/public/browser/dom_storage_context.h"
@@ -25,14 +28,13 @@ class BrowsingDataLocalStorageHelper
  public:
   // Contains detailed information about local storage.
   struct LocalStorageInfo {
-    LocalStorageInfo(
-        const GURL& origin_url,
-        int64 size,
-        base::Time last_modified);
+    LocalStorageInfo(const GURL& origin_url,
+                     int64_t size,
+                     base::Time last_modified);
     ~LocalStorageInfo();
 
     GURL origin_url;
-    int64 size;
+    int64_t size;
     base::Time last_modified;
   };
 
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index ae40709..683c5aa 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -4,15 +4,17 @@
 
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
+#include <stddef.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/thread_test_helper.h"
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper.cc b/chrome/browser/browsing_data/browsing_data_quota_helper.cc
index 8e7ac84..8a2ad0a 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper.cc
@@ -15,9 +15,9 @@ BrowsingDataQuotaHelper::QuotaInfo::QuotaInfo(const std::string& host)
     : host(host) {}
 
 BrowsingDataQuotaHelper::QuotaInfo::QuotaInfo(const std::string& host,
-                                              int64 temporary_usage,
-                                              int64 persistent_usage,
-                                              int64 syncable_usage)
+                                              int64_t temporary_usage,
+                                              int64_t persistent_usage,
+                                              int64_t syncable_usage)
     : host(host),
       temporary_usage(temporary_usage),
       persistent_usage(persistent_usage),
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper.h b/chrome/browser/browsing_data/browsing_data_quota_helper.h
index 0730ab3..614350f 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_H_
 
+#include <stdint.h>
+
 #include <list>
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "storage/common/quota/quota_types.h"
@@ -39,9 +42,9 @@ class BrowsingDataQuotaHelper
     QuotaInfo();
     explicit QuotaInfo(const std::string& host);
     QuotaInfo(const std::string& host,
-              int64 temporary_usage,
-              int64 persistent_usage,
-              int64 syncable_usage);
+              int64_t temporary_usage,
+              int64_t persistent_usage,
+              int64_t syncable_usage);
     ~QuotaInfo();
 
     // Certain versions of MSVC 2008 have bad implementations of ADL for nested
@@ -51,9 +54,9 @@ class BrowsingDataQuotaHelper
     bool operator ==(const QuotaInfo& rhs) const;
 
     std::string host;
-    int64 temporary_usage = 0;
-    int64 persistent_usage = 0;
-    int64 syncable_usage = 0;
+    int64_t temporary_usage = 0;
+    int64_t persistent_usage = 0;
+    int64_t syncable_usage = 0;
   };
 
   typedef std::list<QuotaInfo> QuotaInfoArray;
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
index 70a39a1..80b9848 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
@@ -123,7 +123,7 @@ void BrowsingDataQuotaHelperImpl::GotHostUsage(QuotaInfoMap* quota_info,
                                                const base::Closure& completion,
                                                const std::string& host,
                                                storage::StorageType type,
-                                               int64 usage) {
+                                               int64_t usage) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   switch (type) {
     case storage::kStorageTypeTemporary:
@@ -171,4 +171,4 @@ void BrowsingDataQuotaHelperImpl::RevokeHostQuotaOnIOThread(
 
 void BrowsingDataQuotaHelperImpl::DidRevokeHostQuota(
     storage::QuotaStatusCode /*status*/,
-    int64 /*quota*/) {}
+    int64_t /*quota*/) {}
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
index 3bb9ff1..482ab89 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
@@ -55,14 +58,14 @@ class BrowsingDataQuotaHelperImpl : public BrowsingDataQuotaHelper {
                     const base::Closure& completion,
                     const std::string& host,
                     storage::StorageType type,
-                    int64 usage);
+                    int64_t usage);
 
   // Called when all QuotaManager::GetHostUsage requests are complete.
   void OnGetHostsUsageComplete(const FetchResultCallback& callback,
                                QuotaInfoMap* quota_info);
 
   void RevokeHostQuotaOnIOThread(const std::string& host);
-  void DidRevokeHostQuota(storage::QuotaStatusCode status, int64 quota);
+  void DidRevokeHostQuota(storage::QuotaStatusCode status, int64_t quota);
 
   scoped_refptr<storage::QuotaManager> quota_manager_;
 
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index 32585dc..ac0156f 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -4,8 +4,12 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper_impl.h"
@@ -71,7 +75,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
     client->TouchAllOriginsAndNotify();
   }
 
-  void SetPersistentHostQuota(const std::string& host, int64 quota) {
+  void SetPersistentHostQuota(const std::string& host, int64_t quota) {
     quota_ = -1;
     quota_manager_->SetPersistentHostQuota(
         host, quota,
@@ -87,7 +91,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
                    weak_factory_.GetWeakPtr()));
   }
 
-  void GotPersistentHostQuota(storage::QuotaStatusCode status, int64 quota) {
+  void GotPersistentHostQuota(storage::QuotaStatusCode status, int64_t quota) {
     EXPECT_EQ(storage::kQuotaStatusOk, status);
     quota_ = quota;
   }
@@ -96,9 +100,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
     helper_->RevokeHostQuota(host);
   }
 
-  int64 quota() {
-    return quota_;
-  }
+  int64_t quota() { return quota_; }
 
  private:
   void FetchCompleted(const QuotaInfoArray& quota_info) {
@@ -114,7 +116,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
 
   bool fetching_completed_ = true;
   QuotaInfoArray quota_info_;
-  int64 quota_ = -1;
+  int64_t quota_ = -1;
   base::WeakPtrFactory<BrowsingDataQuotaHelperTest> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataQuotaHelperTest);
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 1c2d5039..490b3cf 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -14,6 +14,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
+#include "build/build_config.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
@@ -476,7 +477,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
     download_prefs->SetSaveFilePath(download_prefs->DownloadPath());
   }
 
-  uint32 storage_partition_remove_mask = 0;
+  uint32_t storage_partition_remove_mask = 0;
 
   // We ignore the REMOVE_COOKIES request if UNPROTECTED_WEB is not set,
   // so that callers who request REMOVE_SITE_DATA with PROTECTED_WEB
@@ -708,7 +709,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
     else
       storage_partition = BrowserContext::GetDefaultStoragePartition(profile_);
 
-    uint32 quota_storage_remove_mask =
+    uint32_t quota_storage_remove_mask =
         ~content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
 
     if (delete_begin_ == base::Time() ||
@@ -1065,7 +1066,7 @@ void BrowsingDataRemover::OnWaitableEventSignaled(
 
 #if defined(ENABLE_PLUGINS)
 void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
-    uint32 request_id,
+    uint32_t request_id,
     bool /* success */) {
   DCHECK(waiting_for_clear_content_licenses_);
   DCHECK_EQ(request_id, deauthorize_content_licenses_request_id_);
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index fd04850..de7414e 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
@@ -15,6 +18,7 @@
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/common/features.h"
 #include "components/search_engines/template_url_service.h"
@@ -285,7 +289,7 @@ class BrowsingDataRemover
 
 #if defined(ENABLE_PLUGINS)
   // PepperFlashSettingsManager::Client implementation.
-  void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
+  void OnDeauthorizeContentLicensesCompleted(uint32_t request_id,
                                              bool success) override;
 #endif
 
@@ -444,7 +448,7 @@ class BrowsingDataRemover
   scoped_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;
 #endif
 
-  uint32 deauthorize_content_licenses_request_id_ = 0;
+  uint32_t deauthorize_content_licenses_request_id_ = 0;
   // True if we're waiting for various data to be deleted.
   // These may only be accessed from UI thread in order to avoid races!
   bool waiting_for_clear_autofill_origin_urls_ = false;
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index 5ab25d6..38310b5 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.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/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_test_util.h b/chrome/browser/browsing_data/browsing_data_remover_test_util.h
index dc7eb17..30e2c59 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_test_util.h
+++ b/chrome/browser/browsing_data/browsing_data_remover_test_util.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_TEST_UTIL_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_TEST_UTIL_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index d62aa5f..7284552 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <string>
 #include <vector>
@@ -13,12 +16,14 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "build/build_config.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
@@ -142,8 +147,8 @@ void FakeDBusCall(const chromeos::BoolDBusMethodCallback& callback) {
 #endif
 
 struct StoragePartitionRemovalData {
-  uint32 remove_mask = 0;
-  uint32 quota_storage_remove_mask = 0;
+  uint32_t remove_mask = 0;
+  uint32_t quota_storage_remove_mask = 0;
   GURL remove_origin;
   base::Time remove_begin;
   base::Time remove_end;
@@ -202,8 +207,8 @@ class TestStoragePartition : public StoragePartition {
     return nullptr;
   }
 
-  void ClearDataForOrigin(uint32 remove_mask,
-                          uint32 quota_storage_remove_mask,
+  void ClearDataForOrigin(uint32_t remove_mask,
+                          uint32_t quota_storage_remove_mask,
                           const GURL& storage_origin,
                           net::URLRequestContextGetter* rq_context,
                           const base::Closure& callback) override {
@@ -214,8 +219,8 @@ class TestStoragePartition : public StoragePartition {
                                        callback));
   }
 
-  void ClearData(uint32 remove_mask,
-                 uint32 quota_storage_remove_mask,
+  void ClearData(uint32_t remove_mask,
+                 uint32_t quota_storage_remove_mask,
                  const GURL& storage_origin,
                  const OriginMatcherFunction& origin_matcher,
                  const base::Time begin,
@@ -1636,7 +1641,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
 
   // Persistent data would be left out since we are not removing from
   // beginning of time.
-  uint32 expected_quota_mask =
+  uint32_t expected_quota_mask =
       ~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
   EXPECT_EQ(removal_data.quota_storage_remove_mask, expected_quota_mask);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
@@ -1677,7 +1682,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
 
   // Persistent data would be left out since we are not removing from
   // beginning of time.
-  uint32 expected_quota_mask =
+  uint32_t expected_quota_mask =
       ~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
   EXPECT_EQ(removal_data.quota_storage_remove_mask, expected_quota_mask);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
diff --git a/chrome/browser/browsing_data/browsing_data_service_worker_helper.h b/chrome/browser/browsing_data/browsing_data_service_worker_helper.h
index c8ddddd..50c807f 100644
--- a/chrome/browser/browsing_data/browsing_data_service_worker_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_service_worker_helper.h
@@ -5,11 +5,14 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_SERVICE_WORKER_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_SERVICE_WORKER_HELPER_H_
 
+#include <stddef.h>
+
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_usage_info.h"
diff --git a/chrome/browser/browsing_data/cache_counter.cc b/chrome/browser/browsing_data/cache_counter.cc
index 31aea22..8993563 100644
--- a/chrome/browser/browsing_data/cache_counter.cc
+++ b/chrome/browser/browsing_data/cache_counter.cc
@@ -34,7 +34,7 @@ void CacheCounter::Count() {
   pending_ = true;
 }
 
-void CacheCounter::OnCacheSizeCalculated(int64 result_bytes) {
+void CacheCounter::OnCacheSizeCalculated(int64_t result_bytes) {
   pending_ = false;
 
   // A value less than 0 means a net error code.
diff --git a/chrome/browser/browsing_data/cache_counter.h b/chrome/browser/browsing_data/cache_counter.h
index 0e3a26f..9ac3ad7 100644
--- a/chrome/browser/browsing_data/cache_counter.h
+++ b/chrome/browser/browsing_data/cache_counter.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_CACHE_COUNTER_H_
 #define CHROME_BROWSER_BROWSING_DATA_CACHE_COUNTER_H_
 
+#include <stdint.h>
+
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/browsing_data/browsing_data_counter.h"
 
@@ -26,7 +28,7 @@ class CacheCounter: public BrowsingDataCounter {
   base::WeakPtrFactory<CacheCounter> weak_ptr_factory_;
 
   void Count() override;
-  void OnCacheSizeCalculated(int64 bytes);
+  void OnCacheSizeCalculated(int64_t bytes);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_CACHE_COUNTER_H_
diff --git a/chrome/browser/browsing_data/canonical_cookie_hash.h b/chrome/browser/browsing_data/canonical_cookie_hash.h
index aeb79bd..cd7d6af 100644
--- a/chrome/browser/browsing_data/canonical_cookie_hash.h
+++ b/chrome/browser/browsing_data/canonical_cookie_hash.h
@@ -9,6 +9,8 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_CANONICAL_COOKIE_HASH_H_
 #define CHROME_BROWSER_BROWSING_DATA_CANONICAL_COOKIE_HASH_H_
 
+#include <stddef.h>
+
 #include "base/containers/hash_tables.h"
 #include "net/cookies/canonical_cookie.h"
 
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index b7715ae..e1e6e73 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <functional>
 #include <map>
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index 51afbc5..4772c7e 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index 575e2f0..d78fb85 100644
--- a/chrome/browser/browsing_data/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h
index e81d92a..4e2a71c 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
 
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 
 class MockBrowsingDataAppCacheHelper
diff --git a/chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h b/chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h
index 4bbaaec..465322b 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_cache_storage_helper.h"
 
 class Profile;
diff --git a/chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h b/chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h
index 96e09cb..e524088 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 
 // Mock for BrowsingDataChannelIDHelper.
diff --git a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h
index 21031a3..8a1184a 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "net/cookies/canonical_cookie.h"
 
diff --git a/chrome/browser/browsing_data/mock_browsing_data_database_helper.h b/chrome/browser/browsing_data/mock_browsing_data_database_helper.h
index 2dc0d83..a6766bb 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_database_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_database_helper.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
 // Mock for BrowsingDataDatabaseHelper.
diff --git a/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h
index 6388cf2..e002ca9 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 
 // Mock for BrowsingDataFileSystemHelper.
diff --git a/chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h b/chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h
index a162da0..07b3bd1 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 
 class MockBrowsingDataFlashLSOHelper : public BrowsingDataFlashLSOHelper {
diff --git a/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h
index 52e495c..c69c54d 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 
 class Profile;
diff --git a/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h
index 3d3cb1d..75eec85 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 // Mock for BrowsingDataLocalStorageHelper.
diff --git a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc
index fc5d7d6..9262a67 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc
@@ -24,11 +24,10 @@ void MockBrowsingDataQuotaHelper::StartFetching(
 void MockBrowsingDataQuotaHelper::RevokeHostQuota(const std::string& host) {
 }
 
-void MockBrowsingDataQuotaHelper::AddHost(
-    const std::string& host,
-    int64 temporary_usage,
-    int64 persistent_usage,
-    int64 syncable_usage) {
+void MockBrowsingDataQuotaHelper::AddHost(const std::string& host,
+                                          int64_t temporary_usage,
+                                          int64_t persistent_usage,
+                                          int64_t syncable_usage) {
   response_.push_back(QuotaInfo(
       host,
       temporary_usage,
diff --git a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h
index 845bfe7..858c361 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
 
+#include <stdint.h>
+
 #include <list>
 #include <string>
 
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 
 class MockBrowsingDataQuotaHelper : public BrowsingDataQuotaHelper {
@@ -18,9 +21,9 @@ class MockBrowsingDataQuotaHelper : public BrowsingDataQuotaHelper {
   void RevokeHostQuota(const std::string& host) override;
 
   void AddHost(const std::string& host,
-               int64 temporary_usage,
-               int64 persistent_usage,
-               int64 syncable_usage);
+               int64_t temporary_usage,
+               int64_t persistent_usage,
+               int64_t syncable_usage);
   void AddQuotaSamples();
   void Notify();
 
diff --git a/chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h b/chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h
index 802c0e6..64424a8 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h"
 
 class Profile;
diff --git a/chrome/browser/caps/generate_state_json.cc b/chrome/browser/caps/generate_state_json.cc
index b03a5d6..1a2ca8ab 100644
--- a/chrome/browser/caps/generate_state_json.cc
+++ b/chrome/browser/caps/generate_state_json.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/caps/generate_state_json.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 
@@ -21,6 +24,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/task_manager/task_manager.h"
 
 namespace {
@@ -115,14 +119,14 @@ class TaskManagerDataDumper :
                      base::SysInfo::NumberOfProcessors());
     dict->SetInteger("system.cpu.logicalprocessors",
                      base::SysInfo::NumberOfProcessors());
-    int64 memory = base::SysInfo::AmountOfPhysicalMemory();
+    int64_t memory = base::SysInfo::AmountOfPhysicalMemory();
     dict->SetInteger("system.memory.physical", InMBFromB(memory));
     memory = base::SysInfo::AmountOfAvailablePhysicalMemory();
     dict->SetInteger("system.memory.available", InMBFromB(memory));
     dict->SetInteger("system.uptime", base::SysInfo::Uptime().InSeconds());
     dict->SetString("os.name", base::SysInfo::OperatingSystemName());
 #if !defined(OS_LINUX)
-    int32 major, minor, bugfix;
+    int32_t major, minor, bugfix;
     base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
     dict->SetInteger("os.version.major", major);
     dict->SetInteger("os.version.minor", minor);
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 2097daf..3640e9f 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -8,17 +8,18 @@
 #include <vector>
 
 #include "base/base_switches.h"
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
diff --git a/chrome/browser/captive_portal/captive_portal_login_detector.h b/chrome/browser/captive_portal/captive_portal_login_detector.h
index 1324e3e..16c280c 100644
--- a/chrome/browser/captive_portal/captive_portal_login_detector.h
+++ b/chrome/browser/captive_portal/captive_portal_login_detector.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_LOGIN_DETECTOR_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_LOGIN_DETECTOR_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 
 class Profile;
diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc
index aa19478..5b49a12 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -11,6 +11,7 @@
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/tick_clock.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h
index 278d825..76a9fce 100644
--- a/chrome/browser/captive_portal/captive_portal_service.h
+++ b/chrome/browser/captive_portal/captive_portal_service.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "base/threading/non_thread_safe.h"
diff --git a/chrome/browser/captive_portal/captive_portal_service_factory.h b/chrome/browser/captive_portal/captive_portal_service_factory.h
index 0b01e50..49cac06 100644
--- a/chrome/browser/captive_portal/captive_portal_service_factory.h
+++ b/chrome/browser/captive_portal/captive_portal_service_factory.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
index 0d33548..6b73a0d 100644
--- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h
index 853cf71..f27c4c2 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper.h
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
index 4ac186f..fba2d1f 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader.h b/chrome/browser/captive_portal/captive_portal_tab_reloader.h
index 2fe64a7..92901b0 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_reloader.h
+++ b/chrome/browser/captive_portal/captive_portal_tab_reloader.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
index cf86439..18fa4a5 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 507b748..0e23c1c 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -8,6 +8,7 @@
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
 #include "chrome/common/net/x509_certificate_model.h"
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index 4b1bad6..ee315c4 100644
--- a/chrome/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/callback.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/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index 0a166a9..6ee4e73 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/character_encoding.h"
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/character_encoding.h b/chrome/browser/character_encoding.h
index 6730b07..2c70a17 100644
--- a/chrome/browser/character_encoding.h
+++ b/chrome/browser/character_encoding.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 class CharacterEncoding {
diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h
index 136e448..9f9b731 100644
--- a/chrome/browser/chrome_browser_application_mac.h
+++ b/chrome/browser/chrome_browser_application_mac.h
@@ -8,6 +8,7 @@
 #ifdef __OBJC__
 
 #import <AppKit/AppKit.h>
+#include <stddef.h>
 
 #include <vector>
 
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 6066d04..a7bbcf6 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -14,6 +14,7 @@
 #include "base/mac/call_with_eh_frame.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
+#include "base/macros.h"
 #import "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #import "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/chrome_browser_application_mac_unittest.mm b/chrome/browser/chrome_browser_application_mac_unittest.mm
index 7b2adc9..69faabf 100644
--- a/chrome/browser/chrome_browser_application_mac_unittest.mm
+++ b/chrome/browser/chrome_browser_application_mac_unittest.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
+#include <stddef.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 9ce113f..b38abad 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -10,6 +10,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
diff --git a/chrome/browser/chrome_browser_field_trials.h b/chrome/browser/chrome_browser_field_trials.h
index d013918..f8c6fea 100644
--- a/chrome/browser/chrome_browser_field_trials.h
+++ b/chrome/browser/chrome_browser_field_trials.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_H_
 #define CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_H_
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 
 namespace base {
 class Time;
diff --git a/chrome/browser/chrome_browser_field_trials_desktop.h b/chrome/browser/chrome_browser_field_trials_desktop.h
index e6629f8..aab5163 100644
--- a/chrome/browser/chrome_browser_field_trials_desktop.h
+++ b/chrome/browser/chrome_browser_field_trials_desktop.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_DESKTOP_H_
 #define CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_DESKTOP_H_
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 
 namespace base {
diff --git a/chrome/browser/chrome_browser_field_trials_mobile.cc b/chrome/browser/chrome_browser_field_trials_mobile.cc
index bf963d9..1793b68 100644
--- a/chrome/browser/chrome_browser_field_trials_mobile.cc
+++ b/chrome/browser/chrome_browser_field_trials_mobile.cc
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
+#include "build/build_config.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/prerender/prerender_field_trial.h"
diff --git a/chrome/browser/chrome_browser_field_trials_mobile.h b/chrome/browser/chrome_browser_field_trials_mobile.h
index 7fd3c2f..33a33d7 100644
--- a/chrome/browser/chrome_browser_field_trials_mobile.h
+++ b/chrome/browser/chrome_browser_field_trials_mobile.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_MOBILE_H_
 #define CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_MOBILE_H_
 
-#include "base/basictypes.h"
 #include "base/time/time.h"
 
 class PrefService;
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 286cf34..a5cb2e13 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/chrome_browser_main.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <string>
 #include <vector>
@@ -504,7 +507,7 @@ bool ProcessSingletonNotificationCallback(
   if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
     std::string start_time_string =
         command_line.GetSwitchValueASCII(switches::kOriginalProcessStartTime);
-    int64 remote_start_time;
+    int64_t remote_start_time;
     if (base::StringToInt64(start_time_string, &remote_start_time)) {
       base::TimeDelta elapsed =
           base::Time::Now() - base::Time::FromInternalValue(remote_start_time);
@@ -539,9 +542,8 @@ void LaunchDevToolsHandlerIfNeeded(const base::CommandLine& command_line) {
     int port;
     if (base::StringToInt(port_str, &port) && port >= 0 && port < 65535) {
       g_browser_process->CreateDevToolsHttpProtocolHandler(
-          chrome::HOST_DESKTOP_TYPE_NATIVE,
-          "127.0.0.1",
-          static_cast<uint16>(port));
+          chrome::HOST_DESKTOP_TYPE_NATIVE, "127.0.0.1",
+          static_cast<uint16_t>(port));
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << port;
     }
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index e142ad2..6ba5ee3 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -5,11 +5,12 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/profiler/stack_sampling_profiler.h"
 #include "base/tracked_objects.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_browser_field_trials.h"
 #include "chrome/browser/chrome_process_singleton.h"
 #include "chrome/browser/first_run/first_run.h"
diff --git a/chrome/browser/chrome_browser_main_android.h b/chrome/browser/chrome_browser_main_android.h
index 6facf02..d9c996b 100644
--- a/chrome/browser/chrome_browser_main_android.h
+++ b/chrome/browser/chrome_browser_main_android.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_ANDROID_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_ANDROID_H_
 
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main.h"
 
 namespace breakpad {
diff --git a/chrome/browser/chrome_browser_main_extra_parts_exo.cc b/chrome/browser/chrome_browser_main_extra_parts_exo.cc
index 9cecfbd..5c814e7 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_exo.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_exo.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chrome_browser_main_extra_parts_x11.h b/chrome/browser/chrome_browser_main_extra_parts_x11.h
index 80c6a80..db9dc71 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_x11.h
+++ b/chrome/browser/chrome_browser_main_extra_parts_x11.h
@@ -7,8 +7,8 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_X11_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_X11_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 
 class ChromeBrowserMainExtraPartsX11 : public ChromeBrowserMainExtraParts {
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 1090f350..466971e 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -6,6 +6,7 @@
 
 #include <fontconfig/fontconfig.h>
 
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/crash/content/app/breakpad_linux.h"
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index ec664c7..0aea116 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -8,6 +8,7 @@
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main_posix.h"
 
 class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
diff --git a/chrome/browser/chrome_browser_main_mac.h b/chrome/browser/chrome_browser_main_mac.h
index d7285f6..edd0276 100644
--- a/chrome/browser/chrome_browser_main_mac.h
+++ b/chrome/browser/chrome_browser_main_mac.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_MAC_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_MAC_H_
 
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main_posix.h"
 
 class ChromeBrowserMainPartsMac : public ChromeBrowserMainPartsPosix {
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
index a69659f..c5007e4 100644
--- a/chrome/browser/chrome_browser_main_posix.cc
+++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -8,6 +8,8 @@
 #include <limits.h>
 #include <pthread.h>
 #include <signal.h>
+#include <stddef.h>
+#include <string.h>
 #include <sys/resource.h>
 #include <unistd.h>
 
@@ -16,8 +18,10 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_number_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/sessions/session_restore.h"
diff --git a/chrome/browser/chrome_browser_main_posix.h b/chrome/browser/chrome_browser_main_posix.h
index 2223eb2..2ac0d0d 100644
--- a/chrome/browser/chrome_browser_main_posix.h
+++ b/chrome/browser/chrome_browser_main_posix.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_POSIX_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_POSIX_H_
 
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main.h"
 
 class ChromeBrowserMainPartsPosix : public ChromeBrowserMainParts {
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index cbe463a..0a1238b 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -6,6 +6,7 @@
 
 #include <windows.h>
 #include <shellapi.h>
+#include <stddef.h>
 
 #include <algorithm>
 
diff --git a/chrome/browser/chrome_browser_main_win.h b/chrome/browser/chrome_browser_main_win.h
index f56f72a..254b487 100644
--- a/chrome/browser/chrome_browser_main_win.h
+++ b/chrome/browser/chrome_browser_main_win.h
@@ -8,6 +8,7 @@
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_WIN_H_
 
 #include "base/files/file_path_watcher.h"
+#include "base/macros.h"
 #include "chrome/browser/chrome_browser_main.h"
 
 class DidRunUpdater;
diff --git a/chrome/browser/chrome_child_process_watcher.h b/chrome/browser/chrome_child_process_watcher.h
index c8f9fdc..9a03cd6 100644
--- a/chrome/browser/chrome_child_process_watcher.h
+++ b/chrome/browser/chrome_child_process_watcher.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_CHILD_PROCESS_WATCHER_H_
 #define CHROME_BROWSER_CHROME_CHILD_PROCESS_WATCHER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "content/public/browser/browser_child_process_observer.h"
 
 // ChromeChildProcessWatcher watches for crashed child processes.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 36baefa..8b6bb09 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -15,6 +15,7 @@
 #include "base/command_line.h"
 #include "base/files/scoped_file.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ -24,6 +25,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "build/build_config.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/apps/app_url_redirector.h"
 #include "chrome/browser/browser_about_handler.h"
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 13af6ee..557b82f 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 #include <utility>
@@ -13,6 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "build/build_config.h"
 #include "content/public/browser/content_browser_client.h"
 
 class ChromeContentBrowserClientParts;
diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc
index af7c13b..36b0559 100644
--- a/chrome/browser/chrome_content_browser_client_browsertest.cc
+++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 1d5455d..e4b60d6 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -7,8 +7,10 @@
 #include <map>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/search_engines/template_url_service.h"
diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc
index b388d97..93d17ff 100644
--- a/chrome/browser/chrome_device_client.cc
+++ b/chrome/browser/chrome_device_client.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chrome_device_client.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/hid/hid_service.h"
 #include "device/usb/usb_service.h"
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
index 0b3e806..648de0a 100644
--- a/chrome/browser/chrome_elf_init_unittest_win.cc
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chrome_elf_init_win.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chrome_elf_init_win.cc b/chrome/browser/chrome_elf_init_win.cc
index eb5cf5b..c400196 100644
--- a/chrome/browser/chrome_elf_init_win.cc
+++ b/chrome/browser/chrome_elf_init_win.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/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc
index e71bd10..39d0fc7 100644
--- a/chrome/browser/chrome_main_browsertest.cc
+++ b/chrome/browser/chrome_main_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/process/launch.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.h b/chrome/browser/chrome_net_benchmarking_message_filter.h
index 3ecf8eb..4c25e67 100644
--- a/chrome/browser/chrome_net_benchmarking_message_filter.h
+++ b/chrome/browser/chrome_net_benchmarking_message_filter.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROME_NET_BENCHMARKING_MESSAGE_FILTER_H_
 #define CHROME_BROWSER_CHROME_NET_BENCHMARKING_MESSAGE_FILTER_H_
 
+#include "base/macros.h"
 #include "content/public/browser/browser_message_filter.h"
 
 namespace net {
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc
index 92c8364..2a92c9e 100644
--- a/chrome/browser/chrome_plugin_browsertest.cc
+++ b/chrome/browser/chrome_plugin_browsertest.cc
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/process/process.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chrome_process_singleton.h b/chrome/browser/chrome_process_singleton.h
index 0162e05..7d62731 100644
--- a/chrome/browser/chrome_process_singleton.h
+++ b/chrome/browser/chrome_process_singleton.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CHROME_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_CHROME_PROCESS_SINGLETON_H_
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/process_singleton_modal_dialog_lock.h"
 #include "chrome/browser/process_singleton_startup_lock.h"
diff --git a/chrome/browser/chrome_process_singleton_win_unittest.cc b/chrome/browser/chrome_process_singleton_win_unittest.cc
index d56d7a5..26f06f3 100644
--- a/chrome/browser/chrome_process_singleton_win_unittest.cc
+++ b/chrome/browser/chrome_process_singleton_win_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc
index 86e8368..f90279d 100644
--- a/chrome/browser/chrome_quota_permission_context.cc
+++ b/chrome/browser/chrome_quota_permission_context.cc
@@ -4,11 +4,15 @@
 
 #include "chrome/browser/chrome_quota_permission_context.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ -36,7 +40,7 @@ namespace {
 
 // If the site requested larger quota than this threshold, show a different
 // message to the user.
-const int64 kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
+const int64_t kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
 
 // QuotaPermissionRequest ---------------------------------------------
 
@@ -45,7 +49,7 @@ class QuotaPermissionRequest : public PermissionBubbleRequest {
   QuotaPermissionRequest(
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
-      int64 requested_quota,
+      int64_t requested_quota,
       bool user_gesture,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
@@ -67,7 +71,7 @@ class QuotaPermissionRequest : public PermissionBubbleRequest {
   scoped_refptr<ChromeQuotaPermissionContext> context_;
   GURL origin_url_;
   std::string display_languages_;
-  int64 requested_quota_;
+  int64_t requested_quota_;
   bool user_gesture_;
   content::QuotaPermissionContext::PermissionCallback callback_;
 
@@ -77,7 +81,7 @@ class QuotaPermissionRequest : public PermissionBubbleRequest {
 QuotaPermissionRequest::QuotaPermissionRequest(
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
-    int64 requested_quota,
+    int64_t requested_quota,
     bool user_gesture,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback)
@@ -154,7 +158,7 @@ class RequestQuotaInfoBarDelegate : public ConfirmInfoBarDelegate {
       InfoBarService* infobar_service,
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
-      int64 requested_quota,
+      int64_t requested_quota,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
 
@@ -162,7 +166,7 @@ class RequestQuotaInfoBarDelegate : public ConfirmInfoBarDelegate {
   RequestQuotaInfoBarDelegate(
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
-      int64 requested_quota,
+      int64_t requested_quota,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
   ~RequestQuotaInfoBarDelegate() override;
@@ -175,7 +179,7 @@ class RequestQuotaInfoBarDelegate : public ConfirmInfoBarDelegate {
   scoped_refptr<ChromeQuotaPermissionContext> context_;
   GURL origin_url_;
   std::string display_languages_;
-  int64 requested_quota_;
+  int64_t requested_quota_;
   content::QuotaPermissionContext::PermissionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestQuotaInfoBarDelegate);
@@ -186,7 +190,7 @@ void RequestQuotaInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
-    int64 requested_quota,
+    int64_t requested_quota,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback) {
   infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
@@ -197,7 +201,7 @@ void RequestQuotaInfoBarDelegate::Create(
 RequestQuotaInfoBarDelegate::RequestQuotaInfoBarDelegate(
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
-    int64 requested_quota,
+    int64_t requested_quota,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback)
     : ConfirmInfoBarDelegate(),
@@ -205,8 +209,7 @@ RequestQuotaInfoBarDelegate::RequestQuotaInfoBarDelegate(
       origin_url_(origin_url),
       display_languages_(display_languages),
       requested_quota_(requested_quota),
-      callback_(callback) {
-}
+      callback_(callback) {}
 
 RequestQuotaInfoBarDelegate::~RequestQuotaInfoBarDelegate() {
   if (!callback_.is_null()) {
diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc
index 00ad2b7..751dfd1 100644
--- a/chrome/browser/chrome_security_exploit_browsertest.cc
+++ b/chrome/browser/chrome_security_exploit_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chrome_select_file_dialog_factory_win.cc b/chrome/browser/chrome_select_file_dialog_factory_win.cc
index 01ff7f6..78cc353 100644
--- a/chrome/browser/chrome_select_file_dialog_factory_win.cc
+++ b/chrome/browser/chrome_select_file_dialog_factory_win.cc
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/chrome_site_per_process_browsertest.cc b/chrome/browser/chrome_site_per_process_browsertest.cc
index c6d9f16..e7f5183 100644
--- a/chrome/browser/chrome_site_per_process_browsertest.cc
+++ b/chrome/browser/chrome_site_per_process_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc
index 872e2d8..a390a99 100644
--- a/chrome/browser/chrome_switches_browsertest.cc
+++ b/chrome/browser/chrome_switches_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chrome_webusb_browser_client.cc b/chrome/browser/chrome_webusb_browser_client.cc
index 4f55d1d..73ac692 100644
--- a/chrome/browser/chrome_webusb_browser_client.cc
+++ b/chrome/browser/chrome_webusb_browser_client.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chrome_webusb_browser_client.h"
 
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/net/referrer.h"
 #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/command_updater.h b/chrome/browser/command_updater.h
index a297a49..a624df9 100644
--- a/chrome/browser/command_updater.h
+++ b/chrome/browser/command_updater.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_COMMAND_UPDATER_H_
 #define CHROME_BROWSER_COMMAND_UPDATER_H_
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "ui/base/window_open_disposition.h"
 
 class CommandObserver;
diff --git a/chrome/browser/component_updater/caps_installer_win.cc b/chrome/browser/component_updater/caps_installer_win.cc
index 4105617..61d87457 100644
--- a/chrome/browser/component_updater/caps_installer_win.cc
+++ b/chrome/browser/component_updater/caps_installer_win.cc
@@ -11,6 +11,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
diff --git a/chrome/browser/component_updater/cld_component_installer.cc b/chrome/browser/component_updater/cld_component_installer.cc
index ace80fe..e69f7ac 100644
--- a/chrome/browser/component_updater/cld_component_installer.cc
+++ b/chrome/browser/component_updater/cld_component_installer.cc
@@ -12,6 +12,7 @@
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/translate/content/browser/browser_cld_data_provider.h"
diff --git a/chrome/browser/component_updater/cld_component_installer_unittest.cc b/chrome/browser/component_updater/cld_component_installer_unittest.cc
index aa19c25..f83565b 100644
--- a/chrome/browser/component_updater/cld_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/cld_component_installer_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
 #include <stdint.h>
 #include <vector>
 
@@ -86,7 +87,7 @@ TEST_F(CldComponentInstallerTest, VerifyInstallation) {
   ASSERT_TRUE(base::CreateDirectory(data_file_dir));
   const base::FilePath data_file = data_file_dir.Append(kTestCldDataFileName);
   const std::string test_data("fake cld2 data file content here :)");
-  ASSERT_EQ(static_cast<int32>(test_data.length()),
+  ASSERT_EQ(static_cast<int32_t>(test_data.length()),
             base::WriteFile(data_file, test_data.c_str(), test_data.length()));
   ASSERT_TRUE(traits_.VerifyInstallation(manifest, temp_dir_.path()));
 }
diff --git a/chrome/browser/component_updater/ev_whitelist_component_installer.cc b/chrome/browser/component_updater/ev_whitelist_component_installer.cc
index 5a52778..35db3e0 100644
--- a/chrome/browser/component_updater/ev_whitelist_component_installer.cc
+++ b/chrome/browser/component_updater/ev_whitelist_component_installer.cc
@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/version.h"
 #include "components/component_updater/component_updater_paths.h"
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc
index f10940b..93b2611 100644
--- a/chrome/browser/component_updater/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -18,6 +18,7 @@
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index ea9b72e..527a0c5 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -24,6 +24,7 @@
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/threading/worker_pool.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/component_updater/component_updater_paths.h"
diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
index 5e82e8c..c4bfe0e 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
@@ -11,6 +13,7 @@
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer.h b/chrome/browser/component_updater/supervised_user_whitelist_installer.h
index 67ae383..dd86e3f 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer.h
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_COMPONENT_UPDATER_SUPERVISED_USER_WHITELIST_INSTALLER_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_SUPERVISED_USER_WHITELIST_INSTALLER_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <string>
 #include <vector>
diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc
index 342f7e3..8005caf 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer_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/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc
index 57e44b2..9ea21f6 100644
--- a/chrome/browser/component_updater/sw_reporter_installer_win.cc
+++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc
@@ -210,14 +210,14 @@ void RegisterSwReporterComponent(ComponentUpdateService* cus) {
       }
       // Get start & end time. If we don't have an end time, we can assume the
       // cleaner has not completed.
-      int64 start_time_value;
+      int64_t start_time_value;
       cleaner_key.ReadInt64(safe_browsing::kStartTimeValueName,
                             &start_time_value);
 
       bool completed = cleaner_key.HasValue(safe_browsing::kEndTimeValueName);
       SRTHasCompleted(completed ? SRT_COMPLETED_YES : SRT_COMPLETED_NOT_YET);
       if (completed) {
-        int64 end_time_value;
+        int64_t end_time_value;
         cleaner_key.ReadInt64(safe_browsing::kEndTimeValueName,
                               &end_time_value);
         cleaner_key.DeleteValue(safe_browsing::kEndTimeValueName);
@@ -247,7 +247,7 @@ void RegisterSwReporterComponent(ComponentUpdateService* cus) {
         DCHECK_GT(elapsed.InMilliseconds(), 0);
         UMA_HISTOGRAM_BOOLEAN(
             "SoftwareReporter.Cleaner.HasRebooted",
-            static_cast<uint64>(elapsed.InMilliseconds()) > ::GetTickCount());
+            static_cast<uint64_t>(elapsed.InMilliseconds()) > ::GetTickCount());
       }
 
       if (cleaner_key.HasValue(kUploadResultsValueName)) {
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index a417bbf..bd5172f 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
 
+#include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <string>
diff --git a/chrome/browser/content_settings/chrome_content_settings_client.h b/chrome/browser/content_settings/chrome_content_settings_client.h
index e8ecfa9..3e33275 100644
--- a/chrome/browser/content_settings/chrome_content_settings_client.h
+++ b/chrome/browser/content_settings/chrome_content_settings_client.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CHROME_CONTENT_SETTINGS_CLIENT_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CHROME_CONTENT_SETTINGS_CLIENT_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index 28ef746..65ecc14 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -6,6 +6,7 @@
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
index b6c49a1..0a5891e 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/content_settings/content_settings_internal_extension_provider.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_content_client.h"
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
index a815bf0..39ca41d 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.h
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 98e861a..a24599f 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/default_pref_store.h"
diff --git a/chrome/browser/content_settings/content_settings_supervised_provider.h b/chrome/browser/content_settings/content_settings_supervised_provider.h
index a5cc640..9a01168 100644
--- a/chrome/browser/content_settings/content_settings_supervised_provider.h
+++ b/chrome/browser/content_settings/content_settings_supervised_provider.h
@@ -8,6 +8,7 @@
 // A content setting provider that is set by the custodian of a supervised user.
 
 #include "base/callback_list.h"
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "components/content_settings/core/browser/content_settings_binary_value_map.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.h b/chrome/browser/content_settings/host_content_settings_map_factory.h
index 5e942c9..4b9344e 100644
--- a/chrome/browser/content_settings/host_content_settings_map_factory.h
+++ b/chrome/browser/content_settings/host_content_settings_map_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_FACTORY_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_FACTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/content_settings/local_shared_objects_container.h b/chrome/browser/content_settings/local_shared_objects_container.h
index 22a88f9..bfc5980 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.h
+++ b/chrome/browser/content_settings/local_shared_objects_container.h
@@ -5,6 +5,9 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_LOCAL_SHARED_OBJECTS_CONTAINER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_LOCAL_SHARED_OBJECTS_CONTAINER_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/content_settings/core/browser/local_shared_objects_counter.h"
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 8adbab2..5edd14e 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -11,6 +11,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index d0be280..c91de10 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -5,14 +5,17 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
+#include "build/build_config.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index e0fc92c..a5e400b 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
diff --git a/chrome/browser/content_settings/web_site_settings_uma_util.cc b/chrome/browser/content_settings/web_site_settings_uma_util.cc
index bb15012..1fa181b 100644
--- a/chrome/browser/content_settings/web_site_settings_uma_util.cc
+++ b/chrome/browser/content_settings/web_site_settings_uma_util.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/content_settings/web_site_settings_uma_util.h"
 
+#include <stddef.h>
+
 #include "base/metrics/histogram_macros.h"
 
 void WebSiteSettingsUmaUtil::LogPermissionChange(ContentSettingsType type,
diff --git a/chrome/browser/content_settings/web_site_settings_uma_util.h b/chrome/browser/content_settings/web_site_settings_uma_util.h
index 61df097..4f4d448 100644
--- a/chrome/browser/content_settings/web_site_settings_uma_util.h
+++ b/chrome/browser/content_settings/web_site_settings_uma_util.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CONTENT_SETTINGS_WEB_SITE_SETTINGS_UMA_UTIL_H_
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "components/content_settings/core/common/content_settings.h"
 
 class WebSiteSettingsUmaUtil {
diff --git a/chrome/browser/copresence/chrome_whispernet_client.cc b/chrome/browser/copresence/chrome_whispernet_client.cc
index b3f5f07..cff9fbb 100644
--- a/chrome/browser/copresence/chrome_whispernet_client.cc
+++ b/chrome/browser/copresence/chrome_whispernet_client.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
 
+#include <stddef.h>
+
 #include "chrome/browser/copresence/chrome_whispernet_config.h"
 #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
 #include "chrome/browser/extensions/component_loader.h"
diff --git a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
index 50b77d7..11ee462 100644
--- a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
+++ b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
 
+#include <stddef.h>
+
 #include <cmath>
 #include <cstdlib>
 #include <string>
@@ -13,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
+#include "build/build_config.h"
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/copresence/chrome_whispernet_config.h b/chrome/browser/copresence/chrome_whispernet_config.h
index 256a4ed..bc36967 100644
--- a/chrome/browser/copresence/chrome_whispernet_config.h
+++ b/chrome/browser/copresence/chrome_whispernet_config.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_COPRESENCE_CHROME_WHISPERNET_CONFIG_H_
 #define CHROME_BROWSER_COPRESENCE_CHROME_WHISPERNET_CONFIG_H_
 
+#include <stdint.h>
+
 // Shared structs with whispernet. TODO(rkc): These will be removed once we can
 // get protobufs working with Nacl. At that point, we'll just pass in
 // config_data.proto to the whispernet nacl wrapper directly.
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 6850fb6..717ee2d3 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -5,7 +5,9 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/crash_upload_list_crashpad.cc b/chrome/browser/crash_upload_list_crashpad.cc
index 6d2ee26..3e0aaca 100644
--- a/chrome/browser/crash_upload_list_crashpad.cc
+++ b/chrome/browser/crash_upload_list_crashpad.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/browser/crash_upload_list_crashpad.h"
 
+#include <stddef.h>
+
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/crash/content/app/crashpad.h"
 
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index ff85af0..8edaa90 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -4,12 +4,16 @@
 
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/prefs/pref_service.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h
index 6c25ac1..eed9600 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
index 38d2e96..abb2ca6 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
@@ -7,6 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
index 20c7cc8..4f725d2 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 
 #include "base/memory/singleton.h"
+#include "build/build_config.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.h b/chrome/browser/custom_handlers/protocol_handler_registry_factory.h
index fc38b59..ad03add 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_REGISTRY_FACTORY_H_
 #define CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_REGISTRY_FACTORY_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
 class Profile;
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index b78fe96..00269d0 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -4,12 +4,15 @@
 
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 
+#include <stddef.h>
+
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc
index 75db6c6..4713fde 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc
+++ b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_request.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/user_metrics.h"
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
index 1ccbf10..c80c4b4 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
+++ b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CUSTOM_HANDLERS_REGISTER_PROTOCOL_HANDLER_PERMISSION_REQUEST_H_
 #define CHROME_BROWSER_CUSTOM_HANDLERS_REGISTER_PROTOCOL_HANDLER_PERMISSION_REQUEST_H_
 
+#include "base/macros.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index 75456dd..db31447 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/custom_home_pages_table_model.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
diff --git a/chrome/browser/custom_home_pages_table_model.h b/chrome/browser/custom_home_pages_table_model.h
index 1b49e97..9c649fa 100644
--- a/chrome/browser/custom_home_pages_table_model.h
+++ b/chrome/browser/custom_home_pages_table_model.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/history/core/browser/history_types.h"
 #include "ui/base/models/table_model.h"
diff --git a/chrome/browser/data_usage/tab_id_provider.cc b/chrome/browser/data_usage/tab_id_provider.cc
index 6a0b63a..89fee80 100644
--- a/chrome/browser/data_usage/tab_id_provider.cc
+++ b/chrome/browser/data_usage/tab_id_provider.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 35cd53f..69fe4a0 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "chrome/browser/defaults.h"
 
 namespace browser_defaults {
diff --git a/chrome/browser/devtools/chrome_devtools_discovery_provider.h b/chrome/browser/devtools/chrome_devtools_discovery_provider.h
index 4b93329..b5440ba 100644
--- a/chrome/browser/devtools/chrome_devtools_discovery_provider.h
+++ b/chrome/browser/devtools/chrome_devtools_discovery_provider.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_CHROME_DEVTOOLS_DISCOVERY_PROVIDER_H_
 #define CHROME_BROWSER_DEVTOOLS_CHROME_DEVTOOLS_DISCOVERY_PROVIDER_H_
 
+#include "base/macros.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 
 class ChromeDevToolsDiscoveryProvider :
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index 4683243..7cfc9c3 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/devtools/devtools_network_protocol_handler.h"
 
 #if !defined(OS_ANDROID)
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.cc b/chrome/browser/devtools/device/adb/adb_client_socket.cc
index 8a1feb4..ba85a23 100644
--- a/chrome/browser/devtools/device/adb/adb_client_socket.cc
+++ b/chrome/browser/devtools/device/adb/adb_client_socket.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/device/adb/adb_client_socket.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.h b/chrome/browser/devtools/device/adb/adb_client_socket.h
index f331b02..acdfec9 100644
--- a/chrome/browser/devtools/device/adb/adb_client_socket.h
+++ b/chrome/browser/devtools/device/adb/adb_client_socket.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_ADB_ADB_CLIENT_SOCKET_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "net/base/io_buffer.h"
 #include "net/socket/stream_socket.h"
 
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
index 3fe93df..333af44 100644
--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
@@ -4,7 +4,11 @@
 
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ -171,7 +175,7 @@ char kSampleWebViewPages[] = "[ {\n"
     "}]";
 
 static const int kBufferSize = 16*1024;
-static const uint16 kAdbPort = 5037;
+static const uint16_t kAdbPort = 5037;
 
 static const int kAdbMessageHeaderSize = 4;
 
diff --git a/chrome/browser/devtools/device/android_device_info_query.cc b/chrome/browser/devtools/device/android_device_info_query.cc
index cb6be0d..5f8b10a 100644
--- a/chrome/browser/devtools/device/android_device_info_query.cc
+++ b/chrome/browser/devtools/device/android_device_info_query.cc
@@ -2,6 +2,9 @@
 // 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/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc
index e7c58b6..1a97d18 100644
--- a/chrome/browser/devtools/device/android_device_manager.cc
+++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/devtools/device/android_device_manager.h"
 
+#include <stddef.h>
 #include <string.h>
 
 #include "base/location.h"
diff --git a/chrome/browser/devtools/device/android_device_manager.h b/chrome/browser/devtools/device/android_device_manager.h
index 235c5c5..331e8fa 100644
--- a/chrome/browser/devtools/device/android_device_manager.h
+++ b/chrome/browser/devtools/device/android_device_manager.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/devtools/device/android_web_socket.cc b/chrome/browser/devtools/device/android_web_socket.cc
index 8906026..4844e89 100644
--- a/chrome/browser/devtools/device/android_web_socket.cc
+++ b/chrome/browser/devtools/device/android_web_socket.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index e0723a8..b0120c5 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <map>
 #include <set>
@@ -15,6 +17,7 @@
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h
index 3b989a3..b315798 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.h
+++ b/chrome/browser/devtools/device/devtools_android_bridge.h
@@ -10,6 +10,7 @@
 
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index 2f4a27e..a03c69d 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.h b/chrome/browser/devtools/device/port_forwarding_controller.h
index b4410e3..c930450 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.h
+++ b/chrome/browser/devtools/device/port_forwarding_controller.h
@@ -7,6 +7,7 @@
 
 #include <map>
 
+#include "base/macros.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/devtools/device/tcp_device_provider.h b/chrome/browser/devtools/device/tcp_device_provider.h
index fe8c8cc..f393cb1 100644
--- a/chrome/browser/devtools/device/tcp_device_provider.h
+++ b/chrome/browser/devtools/device/tcp_device_provider.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_TCP_DEVICE_PROVIDER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_TCP_DEVICE_PROVIDER_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "chrome/browser/devtools/device/android_device_manager.h"
diff --git a/chrome/browser/devtools/device/usb/android_rsa.cc b/chrome/browser/devtools/device/usb/android_rsa.cc
index 9581067..e260345 100644
--- a/chrome/browser/devtools/device/usb/android_rsa.cc
+++ b/chrome/browser/devtools/device/usb/android_rsa.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/devtools/device/usb/android_rsa.h"
 
+#include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <limits>
 
diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
index a01b9ac..e01a875 100644
--- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ -71,8 +74,8 @@ struct BreakingAndroidTraits {
   static const bool kConfigured = true;
 };
 
-const uint32 kMaxPayload = 4096;
-const uint32 kVersion = 0x01000000;
+const uint32_t kMaxPayload = 4096;
+const uint32_t kVersion = 0x01000000;
 
 const char kDeviceManufacturer[] = "Test Manufacturer";
 const char kDeviceModel[] = "Nexus 6";
@@ -168,7 +171,7 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
     NOTIMPLEMENTED();
   }
 
-  void ClearHalt(uint8 endpoint, const ResultCallback& callback) override {
+  void ClearHalt(uint8_t endpoint, const ResultCallback& callback) override {
     NOTIMPLEMENTED();
   }
 
@@ -176,28 +179,28 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
   void ControlTransfer(UsbEndpointDirection direction,
                        TransferRequestType request_type,
                        TransferRecipient recipient,
-                       uint8 request,
-                       uint16 value,
-                       uint16 index,
+                       uint8_t request,
+                       uint16_t value,
+                       uint16_t index,
                        scoped_refptr<net::IOBuffer> buffer,
                        size_t length,
                        unsigned int timeout,
                        const TransferCallback& callback) override {}
 
   void GenericTransfer(UsbEndpointDirection direction,
-                       uint8 endpoint,
+                       uint8_t endpoint,
                        scoped_refptr<net::IOBuffer> buffer,
                        size_t length,
                        unsigned int timeout,
                        const TransferCallback& callback) override {
     if (direction == device::USB_DIRECTION_OUTBOUND) {
       if (remaining_body_length_ == 0) {
-        std::vector<uint32> header(6);
+        std::vector<uint32_t> header(6);
         memcpy(&header[0], buffer->data(), length);
         current_message_.reset(
             new AdbMessage(header[0], header[1], header[2], std::string()));
         remaining_body_length_ = header[3];
-        uint32 magic = header[5];
+        uint32_t magic = header[5];
         if ((current_message_->command ^ 0xffffffff) != magic) {
           DCHECK(false) << "Header checksum error";
           return;
@@ -237,10 +240,10 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
   }
 
   // Copied from AndroidUsbDevice::Checksum
-  uint32 Checksum(const std::string& data) {
+  uint32_t Checksum(const std::string& data) {
     unsigned char* x = (unsigned char*)data.data();
     int count = data.length();
-    uint32 sum = 0;
+    uint32_t sum = 0;
     while (count-- > 0)
       sum += *x++;
     return sum;
@@ -314,7 +317,7 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
     append(arg0);
     append(arg1);
     bool add_zero = !body.empty() && (command != AdbMessage::kCommandWRTE);
-    append(static_cast<uint32>(body.size() + (add_zero ? 1 : 0)));
+    append(static_cast<uint32_t>(body.size() + (add_zero ? 1 : 0)));
     append(Checksum(body));
     append(command ^ 0xffffffff);
     std::copy(body.begin(), body.end(), std::back_inserter(output_buffer_));
@@ -349,7 +352,7 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
   }
 
   void IsochronousTransfer(UsbEndpointDirection direction,
-                           uint8 endpoint,
+                           uint8_t endpoint,
                            scoped_refptr<net::IOBuffer> buffer,
                            size_t length,
                            unsigned int packets,
@@ -372,7 +375,7 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
   };
 
   scoped_refptr<MockUsbDevice<T> > device_;
-  uint32 remaining_body_length_;
+  uint32_t remaining_body_length_;
   scoped_ptr<AdbMessage> current_message_;
   std::vector<char> output_buffer_;
   std::queue<Query> queries_;
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc
index 33efd005..e9e266a 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
@@ -45,8 +45,8 @@ const int kAdbProtocol = 0x1;
 
 const int kUsbTimeout = 0;
 
-const uint32 kMaxPayload = 4096;
-const uint32 kVersion = 0x01000000;
+const uint32_t kMaxPayload = 4096;
+const uint32_t kVersion = 0x01000000;
 
 static const char kHostConnectMessage[] = "host::";
 
@@ -88,10 +88,10 @@ void CountAndroidDevices(const base::Callback<void(int)>& callback,
                           base::Bind(callback, device_count));
 }
 
-uint32 Checksum(const std::string& data) {
+uint32_t Checksum(const std::string& data) {
   unsigned char* x = (unsigned char*)data.data();
   int count = data.length();
-  uint32 sum = 0;
+  uint32_t sum = 0;
   while (count-- > 0)
     sum += *x++;
   return sum;
@@ -290,12 +290,11 @@ void EnumerateOnUIThread(
 
 }  // namespace
 
-AdbMessage::AdbMessage(uint32 command,
-                       uint32 arg0,
-                       uint32 arg1,
+AdbMessage::AdbMessage(uint32_t command,
+                       uint32_t arg0,
+                       uint32_t arg1,
                        const std::string& body)
-    : command(command), arg0(arg0), arg1(arg1), body(body) {
-}
+    : command(command), arg0(arg0), arg1(arg1), body(body) {}
 
 AdbMessage::~AdbMessage() {
 }
@@ -362,15 +361,15 @@ net::StreamSocket* AndroidUsbDevice::CreateSocket(const std::string& command) {
   if (!usb_handle_.get())
     return NULL;
 
-  uint32 socket_id = ++last_socket_id_;
+  uint32_t socket_id = ++last_socket_id_;
   sockets_[socket_id] = new AndroidUsbSocket(this, socket_id, command,
       base::Bind(&AndroidUsbDevice::SocketDeleted, this, socket_id));
   return sockets_[socket_id];
 }
 
-void AndroidUsbDevice::Send(uint32 command,
-                            uint32 arg0,
-                            uint32 arg1,
+void AndroidUsbDevice::Send(uint32_t command,
+                            uint32_t arg0,
+                            uint32_t arg1,
                             const std::string& body) {
   scoped_ptr<AdbMessage> message(new AdbMessage(command, arg0, arg1, body));
   // Delay open request if not yet connected.
@@ -390,7 +389,7 @@ void AndroidUsbDevice::Queue(scoped_ptr<AdbMessage> message) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Queue header.
-  std::vector<uint32> header;
+  std::vector<uint32_t> header;
   header.push_back(message->command);
   header.push_back(message->arg0);
   header.push_back(message->arg1);
@@ -487,13 +486,13 @@ void AndroidUsbDevice::ParseHeader(UsbTransferStatus status,
   }
 
   DumpMessage(false, buffer->data(), result);
-  std::vector<uint32> header(6);
+  std::vector<uint32_t> header(6);
   memcpy(&header[0], buffer->data(), result);
   scoped_ptr<AdbMessage> message(
       new AdbMessage(header[0], header[1], header[2], ""));
-  uint32 data_length = header[3];
-  uint32 data_check = header[4];
-  uint32 magic = header[5];
+  uint32_t data_length = header[3];
+  uint32_t data_check = header[4];
+  uint32_t magic = header[5];
   if ((message->command ^ 0xffffffff) != magic) {
     TransferError(device::USB_TRANSFER_ERROR);
     return;
@@ -511,8 +510,8 @@ void AndroidUsbDevice::ParseHeader(UsbTransferStatus status,
 }
 
 void AndroidUsbDevice::ReadBody(scoped_ptr<AdbMessage> message,
-                                uint32 data_length,
-                                uint32 data_check) {
+                                uint32_t data_length,
+                                uint32_t data_check) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!usb_handle_.get()) {
@@ -529,8 +528,8 @@ void AndroidUsbDevice::ReadBody(scoped_ptr<AdbMessage> message,
 }
 
 void AndroidUsbDevice::ParseBody(scoped_ptr<AdbMessage> message,
-                                 uint32 data_length,
-                                 uint32 data_check,
+                                 uint32_t data_length,
+                                 uint32_t data_check,
                                  UsbTransferStatus status,
                                  scoped_refptr<net::IOBuffer> buffer,
                                  size_t result) {
@@ -544,7 +543,7 @@ void AndroidUsbDevice::ParseBody(scoped_ptr<AdbMessage> message,
   }
 
   if (status != device::USB_TRANSFER_COMPLETED ||
-      static_cast<uint32>(result) != data_length) {
+      static_cast<uint32_t>(result) != data_length) {
     TransferError(status);
     return;
   }
@@ -567,7 +566,7 @@ void AndroidUsbDevice::HandleIncoming(scoped_ptr<AdbMessage> message) {
   switch (message->command) {
     case AdbMessage::kCommandAUTH:
       {
-        DCHECK_EQ(message->arg0, static_cast<uint32>(AdbMessage::kAuthToken));
+      DCHECK_EQ(message->arg0, static_cast<uint32_t>(AdbMessage::kAuthToken));
         if (signature_sent_) {
           Queue(make_scoped_ptr(new AdbMessage(
               AdbMessage::kCommandAUTH,
@@ -661,7 +660,7 @@ void AndroidUsbDevice::Terminate() {
       base::Bind(&ReleaseInterface, usb_handle, interface_id_));
 }
 
-void AndroidUsbDevice::SocketDeleted(uint32 socket_id) {
+void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   sockets_.erase(socket_id);
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.h b/chrome/browser/devtools/device/usb/android_usb_device.h
index af976a0..aab3f3d 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.h
+++ b/chrome/browser/devtools/device/usb/android_usb_device.h
@@ -5,10 +5,14 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <queue>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
@@ -46,15 +50,15 @@ class AdbMessage {
     kAuthRSAPublicKey = 3
   };
 
-  AdbMessage(uint32 command,
-             uint32 arg0,
-             uint32 arg1,
+  AdbMessage(uint32_t command,
+             uint32_t arg0,
+             uint32_t arg1,
              const std::string& body);
   ~AdbMessage();
 
-  uint32 command;
-  uint32 arg0;
-  uint32 arg1;
+  uint32_t command;
+  uint32_t arg0;
+  uint32_t arg1;
   std::string body;
 
  private:
@@ -84,9 +88,9 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
 
   net::StreamSocket* CreateSocket(const std::string& command);
 
-  void Send(uint32 command,
-            uint32 arg0,
-            uint32 arg1,
+  void Send(uint32_t command,
+            uint32_t arg0,
+            uint32_t arg1,
             const std::string& body);
 
   scoped_refptr<device::UsbDeviceHandle> usb_device() { return usb_handle_; }
@@ -111,11 +115,11 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
                    size_t result);
 
   void ReadBody(scoped_ptr<AdbMessage> message,
-                uint32 data_length,
-                uint32 data_check);
+                uint32_t data_length,
+                uint32_t data_check);
   void ParseBody(scoped_ptr<AdbMessage> message,
-                 uint32 data_length,
-                 uint32 data_check,
+                 uint32_t data_length,
+                 uint32_t data_check,
                  device::UsbTransferStatus status,
                  scoped_refptr<net::IOBuffer> buffer,
                  size_t result);
@@ -127,7 +131,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
   void TerminateIfReleased(scoped_refptr<device::UsbDeviceHandle> usb_handle);
   void Terminate();
 
-  void SocketDeleted(uint32 socket_id);
+  void SocketDeleted(uint32_t socket_id);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
@@ -145,8 +149,8 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
   bool signature_sent_;
 
   // Created sockets info
-  uint32 last_socket_id_;
-  typedef std::map<uint32, AndroidUsbSocket*> AndroidUsbSockets;
+  uint32_t last_socket_id_;
+  typedef std::map<uint32_t, AndroidUsbSocket*> AndroidUsbSockets;
   AndroidUsbSockets sockets_;
 
   // Outgoing bulk queue
diff --git a/chrome/browser/devtools/device/usb/android_usb_socket.cc b/chrome/browser/devtools/device/usb/android_usb_socket.cc
index dcca5a2..65cfa94 100644
--- a/chrome/browser/devtools/device/usb/android_usb_socket.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_socket.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/device/usb/android_usb_socket.h"
 
+#include <stddef.h>
+
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -16,7 +18,7 @@ const int kMaxPayload = 4096;
 }  // namespace
 
 AndroidUsbSocket::AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device,
-                                   uint32 socket_id,
+                                   uint32_t socket_id,
                                    const std::string& command,
                                    base::Closure delete_callback)
     : device_(device),
@@ -25,8 +27,7 @@ AndroidUsbSocket::AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device,
       remote_id_(0),
       is_connected_(false),
       delete_callback_(delete_callback),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
 AndroidUsbSocket::~AndroidUsbSocket() {
   DCHECK(CalledOnValidThread());
@@ -148,12 +149,12 @@ int AndroidUsbSocket::Write(net::IOBuffer* buffer,
   return net::ERR_IO_PENDING;
 }
 
-int AndroidUsbSocket::SetReceiveBufferSize(int32 size) {
+int AndroidUsbSocket::SetReceiveBufferSize(int32_t size) {
   NOTIMPLEMENTED();
   return net::ERR_NOT_IMPLEMENTED;
 }
 
-int AndroidUsbSocket::SetSendBufferSize(int32 size) {
+int AndroidUsbSocket::SetSendBufferSize(int32_t size) {
   NOTIMPLEMENTED();
   return net::ERR_NOT_IMPLEMENTED;
 }
diff --git a/chrome/browser/devtools/device/usb/android_usb_socket.h b/chrome/browser/devtools/device/usb/android_usb_socket.h
index 786f404..a634a4d 100644
--- a/chrome/browser/devtools/device/usb/android_usb_socket.h
+++ b/chrome/browser/devtools/device/usb/android_usb_socket.h
@@ -5,6 +5,9 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_SOCKET_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_SOCKET_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ -20,7 +23,7 @@ class AndroidUsbSocket : public net::StreamSocket,
                          public base::NonThreadSafe {
  public:
   AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device,
-                   uint32 socket_id,
+                   uint32_t socket_id,
                    const std::string& command,
                    base::Closure delete_callback);
   ~AndroidUsbSocket() override;
@@ -36,8 +39,8 @@ class AndroidUsbSocket : public net::StreamSocket,
   int Write(net::IOBuffer* buf,
             int buf_len,
             const net::CompletionCallback& callback) override;
-  int SetReceiveBufferSize(int32 size) override;
-  int SetSendBufferSize(int32 size) override;
+  int SetReceiveBufferSize(int32_t size) override;
+  int SetSendBufferSize(int32_t size) override;
   int Connect(const net::CompletionCallback& callback) override;
   void Disconnect() override;
   bool IsConnected() const override;
@@ -64,8 +67,8 @@ class AndroidUsbSocket : public net::StreamSocket,
 
   scoped_refptr<AndroidUsbDevice> device_;
   std::string command_;
-  uint32 local_id_;
-  uint32 remote_id_;
+  uint32_t local_id_;
+  uint32_t remote_id_;
   net::BoundNetLog net_log_;
   bool is_connected_;
   std::string read_buffer_;
diff --git a/chrome/browser/devtools/device/webrtc/devtools_bridge_client.cc b/chrome/browser/devtools/device/webrtc/devtools_bridge_client.cc
index 2ca51d0..a1c7184 100644
--- a/chrome/browser/devtools/device/webrtc/devtools_bridge_client.cc
+++ b/chrome/browser/devtools/device/webrtc/devtools_bridge_client.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_client.h"
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/local_discovery/gcd_api_flow.h"
diff --git a/chrome/browser/devtools/device/webrtc/devtools_bridge_client.h b/chrome/browser/devtools/device/webrtc/devtools_bridge_client.h
index de9b237..f107e2e 100644
--- a/chrome/browser/devtools/device/webrtc/devtools_bridge_client.h
+++ b/chrome/browser/devtools/device/webrtc/devtools_bridge_client.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_DEVTOOLS_BRIDGE_CLIENT_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_DEVTOOLS_BRIDGE_CLIENT_H_
 
+#include "base/macros.h"
 #include "chrome/browser/devtools/device/android_device_manager.h"
 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_instances_request.h"
 #include "chrome/browser/devtools/device/webrtc/send_command_request.h"
diff --git a/chrome/browser/devtools/device/webrtc/devtools_bridge_instances_request.h b/chrome/browser/devtools/device/webrtc/devtools_bridge_instances_request.h
index ad8bb7b..3763b7e 100644
--- a/chrome/browser/devtools/device/webrtc/devtools_bridge_instances_request.h
+++ b/chrome/browser/devtools/device/webrtc/devtools_bridge_instances_request.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_DEVTOOLS_BRIDGE_INSTANCES_REQUEST_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_DEVTOOLS_BRIDGE_INSTANCES_REQUEST_H_
 
+#include "base/macros.h"
 #include "chrome/browser/devtools/device/android_device_manager.h"
 #include "chrome/browser/local_discovery/gcd_api_flow.h"
 
diff --git a/chrome/browser/devtools/device/webrtc/send_command_request.h b/chrome/browser/devtools/device/webrtc/send_command_request.h
index faefac1..045dd7c 100644
--- a/chrome/browser/devtools/device/webrtc/send_command_request.h
+++ b/chrome/browser/devtools/device/webrtc/send_command_request.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_SEND_COMMAND_REQUEST_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_SEND_COMMAND_REQUEST_H_
 
+#include "base/macros.h"
 #include "chrome/browser/local_discovery/gcd_api_flow.h"
 
 class SendCommandRequest : public local_discovery::GCDApiFlowRequest {
diff --git a/chrome/browser/devtools/device/webrtc/webrtc_device_provider.cc b/chrome/browser/devtools/device/webrtc/webrtc_device_provider.cc
index 127f092..ec49e2e 100644
--- a/chrome/browser/devtools/device/webrtc/webrtc_device_provider.cc
+++ b/chrome/browser/devtools/device/webrtc/webrtc_device_provider.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
 
+#include <stddef.h>
+
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/devtools/device/webrtc/webrtc_device_provider.h b/chrome/browser/devtools/device/webrtc/webrtc_device_provider.h
index 556450b..0663fe9 100644
--- a/chrome/browser/devtools/device/webrtc/webrtc_device_provider.h
+++ b/chrome/browser/devtools/device/webrtc/webrtc_device_provider.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_WEBRTC_DEVICE_PROVIDER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_WEBRTC_WEBRTC_DEVICE_PROVIDER_H_
 
+#include "base/macros.h"
 #include "chrome/browser/devtools/device/android_device_manager.h"
 #include "content/public/browser/web_ui_controller.h"
 
diff --git a/chrome/browser/devtools/devtools_contents_resizing_strategy.h b/chrome/browser/devtools/devtools_contents_resizing_strategy.h
index 8814337..9a8d22c 100644
--- a/chrome/browser/devtools/devtools_contents_resizing_strategy.h
+++ b/chrome/browser/devtools/devtools_contents_resizing_strategy.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc
index d3a9312..345ca3a 100644
--- a/chrome/browser/devtools/devtools_file_helper.cc
+++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/md5.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h
index 550a19d..9e70afd 100644
--- a/chrome/browser/devtools/devtools_file_helper.h
+++ b/chrome/browser/devtools/devtools_file_helper.h
@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.cc b/chrome/browser/devtools/devtools_file_system_indexer.cc
index 3a7cc14..3eb1527 100644
--- a/chrome/browser/devtools/devtools_file_system_indexer.cc
+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/devtools_file_system_indexer.h"
 
+#include <stddef.h>
+
 #include <iterator>
 
 #include "base/bind.h"
@@ -13,6 +15,7 @@
 #include "base/files/file_util_proxy.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ -32,9 +35,9 @@ using std::vector;
 
 namespace {
 
-typedef int32 Trigram;
+typedef int32_t Trigram;
 typedef char TrigramChar;
-typedef uint16 FileId;
+typedef uint16_t FileId;
 
 const int kMinTimeoutBetweenWorkedNitification = 200;
 // Trigram characters include all ASCII printable characters (32-126) except for
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.h b/chrome/browser/devtools/devtools_file_system_indexer.h
index 828e2cd..7e5cd34 100644
--- a/chrome/browser/devtools/devtools_file_system_indexer.h
+++ b/chrome/browser/devtools/devtools_file_system_indexer.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_proxy.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 
 class Profile;
@@ -70,8 +73,8 @@ class DevToolsFileSystemIndexer
     FilePathTimesMap file_path_times_;
     FilePathTimesMap::const_iterator indexing_it_;
     base::FileProxy current_file_;
-    int64 current_file_offset_;
-    typedef int32 Trigram;
+    int64_t current_file_offset_;
+    typedef int32_t Trigram;
     std::vector<Trigram> current_trigrams_;
     // The index in this vector is the trigram id.
     std::vector<bool> current_trigrams_set_;
diff --git a/chrome/browser/devtools/devtools_network_controller_unittest.cc b/chrome/browser/devtools/devtools_network_controller_unittest.cc
index ab90bd8..e84d584 100644
--- a/chrome/browser/devtools/devtools_network_controller_unittest.cc
+++ b/chrome/browser/devtools/devtools_network_controller_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/macros.h"
diff --git a/chrome/browser/devtools/devtools_network_interceptor.cc b/chrome/browser/devtools/devtools_network_interceptor.cc
index a75d352..20486e2 100644
--- a/chrome/browser/devtools/devtools_network_interceptor.cc
+++ b/chrome/browser/devtools/devtools_network_interceptor.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/devtools/devtools_network_interceptor.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <limits>
 
@@ -201,7 +203,7 @@ void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) {
   if (upload_time < desired_time)
     desired_time = upload_time;
 
-  int64_t min_baseline = std::numeric_limits<int64>::max();
+  int64_t min_baseline = std::numeric_limits<int64_t>::max();
   for (size_t i = 0; i < suspend_count; ++i) {
     if (suspended_[i].send_end < min_baseline)
       min_baseline = suspended_[i].send_end;
diff --git a/chrome/browser/devtools/devtools_network_interceptor.h b/chrome/browser/devtools/devtools_network_interceptor.h
index f9a441c..1b8976b 100644
--- a/chrome/browser/devtools/devtools_network_interceptor.h
+++ b/chrome/browser/devtools/devtools_network_interceptor.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_NETWORK_INTERCEPTOR_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_NETWORK_INTERCEPTOR_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <string>
 #include <utility>
diff --git a/chrome/browser/devtools/devtools_network_transaction.h b/chrome/browser/devtools/devtools_network_transaction.h
index eb24a3c..c3a2382 100644
--- a/chrome/browser/devtools/devtools_network_transaction.h
+++ b/chrome/browser/devtools/devtools_network_transaction.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/devtools/devtools_network_interceptor.h"
diff --git a/chrome/browser/devtools/devtools_protocol.h b/chrome/browser/devtools/devtools_protocol.h
index 0b014b3..73ac261 100644
--- a/chrome/browser/devtools/devtools_protocol.h
+++ b/chrome/browser/devtools/devtools_protocol.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/values.h"
 
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 67b9b52..a940960 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.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/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
@@ -18,6 +20,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/device/tcp_device_provider.h"
 #include "chrome/browser/devtools/devtools_window_testing.h"
diff --git a/chrome/browser/devtools/devtools_targets_ui.h b/chrome/browser/devtools/devtools_targets_ui.h
index 4174bd8..9205576 100644
--- a/chrome/browser/devtools/devtools_targets_ui.h
+++ b/chrome/browser/devtools/devtools_targets_ui.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 
diff --git a/chrome/browser/devtools/devtools_toggle_action.h b/chrome/browser/devtools/devtools_toggle_action.h
index fa2b2e1..ecd8126 100644
--- a/chrome/browser/devtools/devtools_toggle_action.h
+++ b/chrome/browser/devtools/devtools_toggle_action.h
@@ -5,7 +5,8 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_TOGGLE_ACTION_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_TOGGLE_ACTION_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index a86a924..80cefd8 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/browser/devtools/devtools_ui_bindings.h"
 
+#include <stddef.h>
+
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
@@ -13,6 +16,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_file_watcher.h"
 #include "chrome/browser/devtools/devtools_protocol.h"
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index 2bfe516..60a1d20 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.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/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index aeee74f..e64dafc 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -8,6 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/time/time.h"
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index 001b948..e64bd4b 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 
+#include "base/macros.h"
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/devtools/devtools_ui_bindings.h"
diff --git a/chrome/browser/devtools/devtools_window_testing.h b/chrome/browser/devtools/devtools_window_testing.h
index f987bf0..8027e695 100644
--- a/chrome/browser/devtools/devtools_window_testing.h
+++ b/chrome/browser/devtools/devtools_window_testing.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_TESTING_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/chrome/browser/devtools/global_confirm_info_bar.cc b/chrome/browser/devtools/global_confirm_info_bar.cc
index 0fd261e..1af35c0 100644
--- a/chrome/browser/devtools/global_confirm_info_bar.cc
+++ b/chrome/browser/devtools/global_confirm_info_bar.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/devtools/global_confirm_info_bar.h"
 
+#include "base/macros.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index e7306d1..6028903 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/devtools/remote_debugging_server.h"
 
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ -29,18 +30,17 @@ namespace {
 
 base::LazyInstance<bool>::Leaky g_tethering_enabled = LAZY_INSTANCE_INITIALIZER;
 
-const uint16 kMinTetheringPort = 9333;
-const uint16 kMaxTetheringPort = 9444;
+const uint16_t kMinTetheringPort = 9333;
+const uint16_t kMaxTetheringPort = 9444;
 const int kBackLog = 10;
 
 class TCPServerSocketFactory
     : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory {
  public:
-  TCPServerSocketFactory(const std::string& address, uint16 port)
+  TCPServerSocketFactory(const std::string& address, uint16_t port)
       : address_(address),
         port_(port),
-        last_tethering_port_(kMinTetheringPort) {
-  }
+        last_tethering_port_(kMinTetheringPort) {}
 
  private:
   // devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory.
@@ -59,7 +59,7 @@ class TCPServerSocketFactory
 
     if (last_tethering_port_ == kMaxTetheringPort)
       last_tethering_port_ = kMinTetheringPort;
-    uint16 port = ++last_tethering_port_;
+    uint16_t port = ++last_tethering_port_;
     *name = base::UintToString(port);
     scoped_ptr<net::TCPServerSocket> socket(
         new net::TCPServerSocket(nullptr, net::NetLog::Source()));
@@ -71,8 +71,8 @@ class TCPServerSocketFactory
   }
 
   std::string address_;
-  uint16 port_;
-  uint16 last_tethering_port_;
+  uint16_t port_;
+  uint16_t last_tethering_port_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
 };
@@ -154,7 +154,7 @@ void RemoteDebuggingServer::EnableTetheringForDebug() {
 RemoteDebuggingServer::RemoteDebuggingServer(
     chrome::HostDesktopType host_desktop_type,
     const std::string& ip,
-    uint16 port) {
+    uint16_t port) {
   base::FilePath output_dir;
   if (!port) {
     // The client requested an ephemeral port. Must write the selected
diff --git a/chrome/browser/devtools/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index a1169f0..9c2cb3b 100644
--- a/chrome/browser/devtools/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.h
@@ -5,9 +5,11 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
 #define CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/host_desktop.h"
 
@@ -21,7 +23,7 @@ class RemoteDebuggingServer {
 
   RemoteDebuggingServer(chrome::HostDesktopType host_desktop_type,
                         const std::string& ip,
-                        uint16 port);
+                        uint16_t port);
 
   virtual ~RemoteDebuggingServer();
 
diff --git a/chrome/browser/diagnostics/diagnostics_controller.cc b/chrome/browser/diagnostics/diagnostics_controller.cc
index 0deef5f..c8d7280 100644
--- a/chrome/browser/diagnostics/diagnostics_controller.cc
+++ b/chrome/browser/diagnostics/diagnostics_controller.cc
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
diff --git a/chrome/browser/diagnostics/diagnostics_controller.h b/chrome/browser/diagnostics/diagnostics_controller.h
index af3b295..b62c534 100644
--- a/chrome/browser/diagnostics/diagnostics_controller.h
+++ b/chrome/browser/diagnostics/diagnostics_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_CONTROLLER_H_
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_CONTROLLER_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 
diff --git a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
index 9a349fc..bed7f36 100644
--- a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
+++ b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
@@ -8,8 +8,10 @@
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
diff --git a/chrome/browser/diagnostics/diagnostics_metrics.cc b/chrome/browser/diagnostics/diagnostics_metrics.cc
index eea8278..004f4c5 100644
--- a/chrome/browser/diagnostics/diagnostics_metrics.cc
+++ b/chrome/browser/diagnostics/diagnostics_metrics.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 
diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc
index f210011..177d813 100644
--- a/chrome/browser/diagnostics/diagnostics_model.cc
+++ b/chrome/browser/diagnostics/diagnostics_model.cc
@@ -7,12 +7,13 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/diagnostics/recon_diagnostics.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
diff --git a/chrome/browser/diagnostics/diagnostics_model.h b/chrome/browser/diagnostics/diagnostics_model.h
index 334c284..b202cbc 100644
--- a/chrome/browser/diagnostics/diagnostics_model.h
+++ b/chrome/browser/diagnostics/diagnostics_model.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_MODEL_H_
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_MODEL_H_
 
+#include <stddef.h>
+
 #include <string>
 #include "base/time/time.h"
 
diff --git a/chrome/browser/diagnostics/diagnostics_model_unittest.cc b/chrome/browser/diagnostics/diagnostics_model_unittest.cc
index d8404db..d593bb4 100644
--- a/chrome/browser/diagnostics/diagnostics_model_unittest.cc
+++ b/chrome/browser/diagnostics/diagnostics_model_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc
index 65482da..ff0ba6b 100644
--- a/chrome/browser/diagnostics/diagnostics_test.cc
+++ b/chrome/browser/diagnostics/diagnostics_test.cc
@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 
diff --git a/chrome/browser/diagnostics/diagnostics_test.h b/chrome/browser/diagnostics/diagnostics_test.h
index d2e5144..37f71b1 100644
--- a/chrome/browser/diagnostics/diagnostics_test.h
+++ b/chrome/browser/diagnostics/diagnostics_test.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_TEST_H_
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_TEST_H_
 
+#include <stddef.h>
+
 #include "base/compiler_specific.h"
 #include "chrome/browser/diagnostics/diagnostics_metrics.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
diff --git a/chrome/browser/diagnostics/diagnostics_writer.cc b/chrome/browser/diagnostics/diagnostics_writer.cc
index f219812..a55fed6 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;
diff --git a/chrome/browser/diagnostics/diagnostics_writer.h b/chrome/browser/diagnostics/diagnostics_writer.h
index 6e908ec..7b4e9ad 100644
--- a/chrome/browser/diagnostics/diagnostics_writer.h
+++ b/chrome/browser/diagnostics/diagnostics_writer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_WRITER_H_
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_WRITER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index fdce774..6b9b354 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -4,17 +4,22 @@
 
 #include "chrome/browser/diagnostics/recon_diagnostics.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
+#include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
@@ -40,8 +45,8 @@ namespace diagnostics {
 
 namespace {
 
-const int64 kOneKilobyte = 1024;
-const int64 kOneMegabyte = 1024 * kOneKilobyte;
+const int64_t kOneKilobyte = 1024;
+const int64_t kOneMegabyte = 1024 * kOneKilobyte;
 
 class InstallTypeTest;
 InstallTypeTest* g_install_type = 0;
@@ -112,7 +117,7 @@ class DiskSpaceTest : public DiagnosticsTest {
     base::FilePath data_dir;
     if (!PathService::Get(chrome::DIR_USER_DATA, &data_dir))
       return false;
-    int64 disk_space = base::SysInfo::AmountOfFreeDiskSpace(data_dir);
+    int64_t disk_space = base::SysInfo::AmountOfFreeDiskSpace(data_dir);
     if (disk_space < 0) {
       RecordFailure(DIAG_RECON_UNABLE_TO_QUERY, "Unable to query free space");
       return true;
@@ -172,7 +177,7 @@ class JSONTest : public DiagnosticsTest {
 
   JSONTest(const base::FilePath& path,
            DiagnosticsTestId id,
-           int64 max_file_size,
+           int64_t max_file_size,
            FileImportance importance)
       : DiagnosticsTest(id),
         path_(path),
@@ -192,7 +197,7 @@ class JSONTest : public DiagnosticsTest {
       }
       return true;
     }
-    int64 file_size;
+    int64_t file_size;
     if (!base::GetFileSize(path_, &file_size)) {
       RecordFailure(DIAG_RECON_CANNOT_OBTAIN_FILE_SIZE,
                     "Cannot obtain file size");
@@ -230,7 +235,7 @@ class JSONTest : public DiagnosticsTest {
 
  private:
   base::FilePath path_;
-  int64 max_file_size_;
+  int64_t max_file_size_;
   FileImportance importance_;
   DISALLOW_COPY_AND_ASSIGN(JSONTest);
 };
@@ -271,7 +276,7 @@ struct TestPathInfo {
   bool is_directory;
   bool is_optional;
   bool test_writable;
-  int64 max_size;
+  int64_t max_size;
 };
 
 const TestPathInfo kPathsToTest[] = {
@@ -312,7 +317,7 @@ class PathTest : public DiagnosticsTest {
       return true;
     }
 
-    int64 dir_or_file_size = 0;
+    int64_t dir_or_file_size = 0;
     if (path_info_.is_directory) {
       dir_or_file_size = base::ComputeDirectorySize(dir_or_file);
     } else {
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index b342bba..76b475f 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -4,9 +4,12 @@
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
+#include <stdint.h>
+
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
@@ -15,6 +18,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_constants.h"
@@ -40,7 +44,7 @@ class SqliteIntegrityTest : public DiagnosticsTest {
     REMOVE_IF_CORRUPT = 0x02,
   };
 
-  SqliteIntegrityTest(uint32 flags,
+  SqliteIntegrityTest(uint32_t flags,
                       DiagnosticsTestId id,
                       const base::FilePath& db_path)
       : DiagnosticsTest(id), flags_(flags), db_path_(db_path) {}
@@ -194,7 +198,7 @@ class SqliteIntegrityTest : public DiagnosticsTest {
     DISALLOW_COPY_AND_ASSIGN(ErrorRecorder);
   };
 
-  uint32 flags_;
+  uint32_t flags_;
   base::FilePath db_path_;
   DISALLOW_COPY_AND_ASSIGN(SqliteIntegrityTest);
 };
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.h b/chrome/browser/diagnostics/sqlite_diagnostics.h
index d098e07..e407253 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.h
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DIAGNOSTICS_SQLITE_DIAGNOSTICS_H_
 #define CHROME_BROWSER_DIAGNOSTICS_SQLITE_DIAGNOSTICS_H_
 
+#include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 
 namespace diagnostics {
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.h b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
index 38e29b6..1632bae 100644
--- a/chrome/browser/dom_distiller/dom_distiller_service_factory.h
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
diff --git a/chrome/browser/dom_distiller/lazy_dom_distiller_service.h b/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
index 8f7522f..a39dc45 100644
--- a/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
+++ b/chrome/browser/dom_distiller/lazy_dom_distiller_service.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_DISTILLER_LAZY_DOM_DISTILLER_SERVICE_H_
 #define CHROME_BROWSER_DOM_DISTILLER_LAZY_DOM_DISTILLER_SERVICE_H_
 
+#include "base/macros.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
index 6fd6aaf..2d5fa76 100644
--- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/dom_distiller/tab_utils.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc
index bccd3d0..668194f 100644
--- a/chrome/browser/domain_reliability/service_factory.cc
+++ b/chrome/browser/domain_reliability/service_factory.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
+#include "build/build_config.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/domain_reliability/service.h"
diff --git a/chrome/browser/domain_reliability/service_factory.h b/chrome/browser/domain_reliability/service_factory.h
index 2b43e1b..bc90366 100644
--- a/chrome/browser/domain_reliability/service_factory.h
+++ b/chrome/browser/domain_reliability/service_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOMAIN_RELIABILITY_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_DOMAIN_RELIABILITY_SERVICE_FACTORY_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
diff --git a/chrome/browser/download/all_download_item_notifier.h b/chrome/browser/download/all_download_item_notifier.h
index 86d4d68..c489214 100644
--- a/chrome/browser/download/all_download_item_notifier.h
+++ b/chrome/browser/download/all_download_item_notifier.h
@@ -7,8 +7,9 @@
 
 #include <set>
 
-#include "content/public/browser/download_manager.h"
+#include "base/macros.h"
 #include "content/public/browser/download_item.h"
+#include "content/public/browser/download_manager.h"
 
 // AllDownloadItemNotifier observes ALL the DownloadItems on a given
 // DownloadManager.
diff --git a/chrome/browser/download/all_download_item_notifier_unittest.cc b/chrome/browser/download/all_download_item_notifier_unittest.cc
index 99d0f58..6793886 100644
--- a/chrome/browser/download/all_download_item_notifier_unittest.cc
+++ b/chrome/browser/download/all_download_item_notifier_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/download/all_download_item_notifier.h"
 
+#include "base/macros.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 17f3076..e6a9c5c 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -6,11 +6,11 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
@@ -20,6 +20,7 @@
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_completion_blocker.h"
 #include "chrome/browser/download/download_crx_util.h"
@@ -212,7 +213,7 @@ ChromeDownloadManagerDelegate::GetDownloadIdReceiverCallback() {
                     weak_ptr_factory_.GetWeakPtr());
 }
 
-void ChromeDownloadManagerDelegate::SetNextId(uint32 next_id) {
+void ChromeDownloadManagerDelegate::SetNextId(uint32_t next_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!profile_->IsOffTheRecord());
   DCHECK_NE(content::DownloadItem::kInvalidId, next_id);
@@ -345,7 +346,7 @@ bool ChromeDownloadManagerDelegate::IsDownloadReadyForCompletion(
 }
 
 void ChromeDownloadManagerDelegate::ShouldCompleteDownloadInternal(
-    uint32 download_id,
+    uint32_t download_id,
     const base::Closure& user_complete_callback) {
   DownloadItem* item = download_manager_->GetDownload(download_id);
   if (!item)
@@ -642,7 +643,7 @@ void ChromeDownloadManagerDelegate::GetFileMimeType(
 
 #if defined(FULL_SAFE_BROWSING)
 void ChromeDownloadManagerDelegate::CheckClientDownloadDone(
-    uint32 download_id,
+    uint32_t download_id,
     DownloadProtectionService::DownloadCheckResult result) {
   DownloadItem* item = download_manager_->GetDownload(download_id);
   if (!item || (item->GetState() != DownloadItem::IN_PROGRESS))
@@ -710,7 +711,7 @@ void ChromeDownloadManagerDelegate::Observe(
 }
 
 void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
-    int32 download_id,
+    int32_t download_id,
     const content::DownloadTargetCallback& callback,
     scoped_ptr<DownloadTargetInfo> target_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
index d3eee8f..508966f 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
@@ -132,7 +135,7 @@ class ChromeDownloadManagerDelegate
 
   // Callback function after the DownloadProtectionService completes.
   void CheckClientDownloadDone(
-      uint32 download_id,
+      uint32_t download_id,
       safe_browsing::DownloadProtectionService::DownloadCheckResult result);
 
   // Internal gateways for ShouldCompleteDownload().
@@ -140,15 +143,15 @@ class ChromeDownloadManagerDelegate
       content::DownloadItem* item,
       const base::Closure& internal_complete_callback);
   void ShouldCompleteDownloadInternal(
-    uint32 download_id,
-    const base::Closure& user_complete_callback);
+      uint32_t download_id,
+      const base::Closure& user_complete_callback);
 
-  void SetNextId(uint32 id);
+  void SetNextId(uint32_t id);
 
   void ReturnNextId(const content::DownloadIdCallback& callback);
 
   void OnDownloadTargetDetermined(
-      int32 download_id,
+      int32_t download_id,
       const content::DownloadTargetCallback& callback,
       scoped_ptr<DownloadTargetInfo> target_info);
 
@@ -156,7 +159,7 @@ class ChromeDownloadManagerDelegate
   bool IsOpenInBrowserPreferreredForFile(const base::FilePath& path);
 
   Profile* profile_;
-  uint32 next_download_id_;
+  uint32_t next_download_id_;
   IdCallbackVector id_callbacks_;
   scoped_ptr<DownloadPrefs> download_prefs_;
 
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index 530915a..adf95d7 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ -137,7 +140,7 @@ class ChromeDownloadManagerDelegateTest
   void VerifyAndClearExpectations();
 
   // Creates MockDownloadItem and sets up default expectations.
-  content::MockDownloadItem* CreateActiveDownloadItem(int32 id);
+  content::MockDownloadItem* CreateActiveDownloadItem(int32_t id);
 
   // Given the relative path |path|, returns the full path under the temporary
   // downloads directory.
@@ -197,7 +200,7 @@ void ChromeDownloadManagerDelegateTest::VerifyAndClearExpectations() {
 }
 
 content::MockDownloadItem*
-    ChromeDownloadManagerDelegateTest::CreateActiveDownloadItem(int32 id) {
+ChromeDownloadManagerDelegateTest::CreateActiveDownloadItem(int32_t id) {
   content::MockDownloadItem* item =
       new ::testing::NiceMock<content::MockDownloadItem>();
   ON_CALL(*item, GetBrowserContext())
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 408b5dd..7fc902a 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.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 <sstream>
 
 #include "base/bind.h"
@@ -12,6 +14,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
@@ -23,6 +26,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/test/test_file_util.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -639,7 +643,7 @@ class DownloadTest : public InProcessBrowserTest {
     if (!downloaded_file_exists)
       return false;
 
-    int64 origin_file_size = 0;
+    int64_t origin_file_size = 0;
     EXPECT_TRUE(base::GetFileSize(origin_file, &origin_file_size));
     std::string original_file_contents;
     EXPECT_TRUE(base::ReadFileToString(origin_file, &original_file_contents));
@@ -788,7 +792,7 @@ class DownloadTest : public InProcessBrowserTest {
   // string.
   bool VerifyFile(const base::FilePath& path,
                   const std::string& value,
-                  const int64 file_size) {
+                  const int64_t file_size) {
     std::string file_contents;
 
     bool read = base::ReadFileToString(path, &file_contents);
@@ -1363,7 +1367,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_IncognitoRegular) {
   base::FilePath origin(OriginFile(base::FilePath(FILE_PATH_LITERAL(
       "downloads/a_zip_file.zip"))));
   ASSERT_TRUE(base::PathExists(origin));
-  int64 origin_file_size = 0;
+  int64_t origin_file_size = 0;
   EXPECT_TRUE(base::GetFileSize(origin, &origin_file_size));
   std::string original_contents;
   EXPECT_TRUE(base::ReadFileToString(origin, &original_contents));
@@ -2984,7 +2988,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_PercentComplete) {
       browser(), base::FilePath(FILE_PATH_LITERAL("DownloadTest_BigZip.zip"))));
   base::File file(file_path, base::File::FLAG_CREATE | base::File::FLAG_WRITE);
   ASSERT_TRUE(file.IsValid());
-  int64 size = 1 << 25;
+  int64_t size = 1 << 25;
   EXPECT_EQ(1, file.Write(size, "a", 1));
   file.Close();
 
@@ -2994,8 +2998,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_PercentComplete) {
 #endif
 
   // Ensure that we have enough disk space.
-  int64 free_space = base::SysInfo::AmountOfFreeDiskSpace(
-      GetDownloadDirectory(browser()));
+  int64_t free_space =
+      base::SysInfo::AmountOfFreeDiskSpace(GetDownloadDirectory(browser()));
   ASSERT_LE(size, free_space) << "Not enough disk space to download. Got "
                               << free_space;
   GURL file_url(net::FilePathToFileURL(file_path));
@@ -3021,7 +3025,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_PercentComplete) {
 
   // Check that the file downloaded correctly.
   ASSERT_TRUE(base::PathExists(download_items[0]->GetTargetFilePath()));
-  int64 downloaded_size = 0;
+  int64_t downloaded_size = 0;
   ASSERT_TRUE(base::GetFileSize(
       download_items[0]->GetTargetFilePath(), &downloaded_size));
   ASSERT_EQ(size + 1, downloaded_size);
diff --git a/chrome/browser/download/download_browsertest.h b/chrome/browser/download/download_browsertest.h
index c1ef227..3feb4ab 100644
--- a/chrome/browser/download/download_browsertest.h
+++ b/chrome/browser/download/download_browsertest.h
@@ -5,7 +5,9 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_BROWSERTEST_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_BROWSERTEST_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "content/public/test/download_test_observer.h"
 
 // DownloadTestObserver subclass that observes a download until it transitions
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc
index d327d16..2fc2b71 100644
--- a/chrome/browser/download/download_commands.cc
+++ b/chrome/browser/download/download_commands.cc
@@ -8,8 +8,10 @@
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_extensions.h"
@@ -65,7 +67,7 @@ class ImageClipboardCopyManager : public ImageDecoder::ImageRequest {
         RunsTasksOnCurrentThread());
 
     // Re-check the filesize since the file may be modified after downloaded.
-    int64 filesize;
+    int64_t filesize;
     if (!GetFileSize(file_path_, &filesize) ||
         filesize > kMaxImageClipboardSize) {
       OnFailedBeforeDecoding();
diff --git a/chrome/browser/download/download_commands.h b/chrome/browser/download/download_commands.h
index 63f31ec..f76ca06 100644
--- a/chrome/browser/download/download_commands.h
+++ b/chrome/browser/download/download_commands.h
@@ -7,6 +7,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/page_navigator.h"
diff --git a/chrome/browser/download/download_completion_blocker.h b/chrome/browser/download/download_completion_blocker.h
index da3e061..291503b 100644
--- a/chrome/browser/download/download_completion_blocker.h
+++ b/chrome/browser/download/download_completion_blocker.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMPLETION_BLOCKER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/download_item.h"
 
diff --git a/chrome/browser/download/download_crx_util.h b/chrome/browser/download/download_crx_util.h
index cc99c19..d76ee45 100644
--- a/chrome/browser/download/download_crx_util.h
+++ b/chrome/browser/download/download_crx_util.h
@@ -8,7 +8,6 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_CRX_UTIL_H_
 
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc
index b6f0a09..91ed0bb 100644
--- a/chrome/browser/download/download_danger_prompt.cc
+++ b/chrome/browser/download/download_danger_prompt.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/download/download_danger_prompt.h"
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc
index a0cde01..9ea379e4 100644
--- a/chrome/browser/download/download_danger_prompt_browsertest.cc
+++ b/chrome/browser/download/download_danger_prompt_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
diff --git a/chrome/browser/download/download_dir_policy_handler.cc b/chrome/browser/download/download_dir_policy_handler.cc
index c027e44..1a98cdc 100644
--- a/chrome/browser/download/download_dir_policy_handler.cc
+++ b/chrome/browser/download/download_dir_policy_handler.cc
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/download/download_dir_policy_handler.h"
 
+#include <stddef.h>
+
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/download/download_dir_policy_handler.h b/chrome/browser/download/download_dir_policy_handler.h
index 2fbf0d7..5f26aa2 100644
--- a/chrome/browser/download/download_dir_policy_handler.h
+++ b/chrome/browser/download/download_dir_policy_handler.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_DIR_POLICY_HANDLER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_DIR_POLICY_HANDLER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/policy/core/browser/configuration_policy_handler.h"
 
 class PrefValueMap;
diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc
index d713ba7..0b78adb 100644
--- a/chrome/browser/download/download_dir_policy_handler_unittest.cc
+++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_dir_policy_handler.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/download/download_extensions.cc b/chrome/browser/download/download_extensions.cc
index 8808a34..21ed194 100644
--- a/chrome/browser/download/download_extensions.cc
+++ b/chrome/browser/download/download_extensions.cc
@@ -7,8 +7,10 @@
 
 #include "chrome/browser/download/download_extensions.h"
 
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 
diff --git a/chrome/browser/download/download_file_picker.h b/chrome/browser/download/download_file_picker.h
index bf7754d..f925d0a 100644
--- a/chrome/browser/download/download_file_picker.h
+++ b/chrome/browser/download/download_file_picker.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_PICKER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace base {
diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc
index becc0e5..c04df4b 100644
--- a/chrome/browser/download/download_history.cc
+++ b/chrome/browser/download/download_history.cc
@@ -28,6 +28,7 @@
 
 #include "chrome/browser/download/download_history.h"
 
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "components/history/content/browser/download_constants_utils.h"
@@ -192,7 +193,7 @@ void DownloadHistory::HistoryAdapter::UpdateDownload(
 }
 
 void DownloadHistory::HistoryAdapter::RemoveDownloads(
-    const std::set<uint32>& ids) {
+    const std::set<uint32_t>& ids) {
   history_->RemoveDownloads(ids);
 }
 
@@ -295,7 +296,7 @@ void DownloadHistory::QueryCallback(scoped_ptr<InfoVector> infos) {
 void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  uint32 download_id = item->GetId();
+  uint32_t download_id = item->GetId();
   DownloadHistoryData* data = DownloadHistoryData::Get(item);
   bool removing = removing_ids_.find(download_id) != removing_ids_.end();
 
@@ -321,7 +322,7 @@ void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
       item, *data->info()));
 }
 
-void DownloadHistory::ItemAdded(uint32 download_id, bool success) {
+void DownloadHistory::ItemAdded(uint32_t download_id, bool success) {
   if (removed_while_adding_.find(download_id) !=
       removed_while_adding_.end()) {
     removed_while_adding_.erase(download_id);
@@ -444,7 +445,7 @@ void DownloadHistory::OnDownloadRemoved(
   --history_size_;
 }
 
-void DownloadHistory::ScheduleRemoveDownload(uint32 download_id) {
+void DownloadHistory::ScheduleRemoveDownload(uint32_t download_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // For database efficiency, batch removals together if they happen all at
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h
index 6b3c1cb..eafb61b 100644
--- a/chrome/browser/download/download_history.h
+++ b/chrome/browser/download/download_history.h
@@ -5,11 +5,13 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_HISTORY_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
@@ -25,7 +27,7 @@ struct DownloadRow;
 // DownloadDatabase up to date.
 class DownloadHistory : public AllDownloadItemNotifier::Observer {
  public:
-  typedef std::set<uint32> IdSet;
+  typedef std::set<uint32_t> IdSet;
 
   // Caller must guarantee that HistoryService outlives HistoryAdapter.
   class HistoryAdapter {
@@ -42,7 +44,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
 
     virtual void UpdateDownload(const history::DownloadRow& data);
 
-    virtual void RemoveDownloads(const std::set<uint32>& ids);
+    virtual void RemoveDownloads(const std::set<uint32_t>& ids);
 
    private:
     history::HistoryService* history_;
@@ -106,7 +108,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
 
   // Callback from |history_| when an item was successfully inserted into the
   // database.
-  void ItemAdded(uint32 id, bool success);
+  void ItemAdded(uint32_t id, bool success);
 
   // AllDownloadItemNotifier::Observer
   void OnDownloadCreated(content::DownloadManager* manager,
@@ -121,7 +123,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
   // Schedule a record to be removed from |history_| the next time
   // RemoveDownloadsBatch() runs. Schedule RemoveDownloadsBatch() to be run soon
   // if it isn't already scheduled.
-  void ScheduleRemoveDownload(uint32 download_id);
+  void ScheduleRemoveDownload(uint32_t download_id);
 
   // Removes all |removing_ids_| from |history_|.
   void RemoveDownloadsBatch();
@@ -133,7 +135,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
   // Identifier of the item being created in QueryCallback(), matched up with
   // created items in OnDownloadCreated() so that the item is not re-added to
   // the database.
-  uint32 loading_id_;
+  uint32_t loading_id_;
 
   // Identifiers of items that are scheduled for removal from history, to
   // facilitate batching removals together for database efficiency.
@@ -146,7 +148,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
   IdSet removed_while_adding_;
 
   // Count the number of items in the history for UMA.
-  int64 history_size_;
+  int64_t history_size_;
 
   base::ObserverList<Observer> observers_;
 
diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc
index db441ed..5a4af5b 100644
--- a/chrome/browser/download/download_history_unittest.cc
+++ b/chrome/browser/download/download_history_unittest.cc
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
@@ -346,49 +350,37 @@ class DownloadHistoryTest : public testing::Test {
     GURL referrer(referrer_string);
     std::vector<GURL> url_chain;
     url_chain.push_back(url);
-    InitItem(static_cast<uint32>(items_.size() + 1),
-             base::FilePath(path),
-             base::FilePath(path),
-             url_chain,
-             referrer,
-             "application/octet-stream",
-             "application/octet-stream",
+    InitItem(static_cast<uint32_t>(items_.size() + 1), base::FilePath(path),
+             base::FilePath(path), url_chain, referrer,
+             "application/octet-stream", "application/octet-stream",
              (base::Time::Now() - base::TimeDelta::FromMinutes(10)),
-             (base::Time::Now() - base::TimeDelta::FromMinutes(1)),
-             "Etag",
-             "abc",
-             100,
-             100,
-             content::DownloadItem::COMPLETE,
+             (base::Time::Now() - base::TimeDelta::FromMinutes(1)), "Etag",
+             "abc", 100, 100, content::DownloadItem::COMPLETE,
              content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-             content::DOWNLOAD_INTERRUPT_REASON_NONE,
-             false,
-             std::string(),
-             std::string(),
-             info);
-  }
-
-  void InitItem(
-      uint32 id,
-      const base::FilePath& current_path,
-      const base::FilePath& target_path,
-      const std::vector<GURL>& url_chain,
-      const GURL& referrer,
-      const std::string& mime_type,
-      const std::string& original_mime_type,
-      const base::Time& start_time,
-      const base::Time& end_time,
-      const std::string& etag,
-      const std::string& last_modified,
-      int64 received_bytes,
-      int64 total_bytes,
-      content::DownloadItem::DownloadState state,
-      content::DownloadDangerType danger_type,
-      content::DownloadInterruptReason interrupt_reason,
-      bool opened,
-      const std::string& by_extension_id,
-      const std::string& by_extension_name,
-      history::DownloadRow* info) {
+             content::DOWNLOAD_INTERRUPT_REASON_NONE, false, std::string(),
+             std::string(), info);
+  }
+
+  void InitItem(uint32_t id,
+                const base::FilePath& current_path,
+                const base::FilePath& target_path,
+                const std::vector<GURL>& url_chain,
+                const GURL& referrer,
+                const std::string& mime_type,
+                const std::string& original_mime_type,
+                const base::Time& start_time,
+                const base::Time& end_time,
+                const std::string& etag,
+                const std::string& last_modified,
+                int64_t received_bytes,
+                int64_t total_bytes,
+                content::DownloadItem::DownloadState state,
+                content::DownloadDangerType danger_type,
+                content::DownloadInterruptReason interrupt_reason,
+                bool opened,
+                const std::string& by_extension_id,
+                const std::string& by_extension_name,
+                history::DownloadRow* info) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
     size_t index = items_.size();
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index 6b72f14..177617b 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -319,8 +319,8 @@ base::string16 DownloadItemModel::GetStatusText() const {
 }
 
 base::string16 DownloadItemModel::GetTabProgressStatusText() const {
-  int64 total = GetTotalBytes();
-  int64 size = download_->GetReceivedBytes();
+  int64_t total = GetTotalBytes();
+  int64_t size = download_->GetReceivedBytes();
   base::string16 received_size = ui::FormatBytes(size);
   base::string16 amount = received_size;
 
@@ -338,7 +338,7 @@ base::string16 DownloadItemModel::GetTabProgressStatusText() const {
   } else {
     amount.assign(received_size);
   }
-  int64 current_speed = download_->CurrentSpeed();
+  int64_t current_speed = download_->CurrentSpeed();
   base::string16 speed_text = ui::FormatSpeed(current_speed);
   base::i18n::AdjustStringForLocaleDirection(&speed_text);
 
@@ -431,11 +431,11 @@ base::string16 DownloadItemModel::GetWarningConfirmButtonText() const {
   }
 }
 
-int64 DownloadItemModel::GetCompletedBytes() const {
+int64_t DownloadItemModel::GetCompletedBytes() const {
   return download_->GetReceivedBytes();
 }
 
-int64 DownloadItemModel::GetTotalBytes() const {
+int64_t DownloadItemModel::GetTotalBytes() const {
   return download_->AllDataSaved() ? download_->GetReceivedBytes() :
                                      download_->GetTotalBytes();
 }
@@ -631,8 +631,8 @@ void DownloadItemModel::SetIsBeingRevived(bool is_being_revived) {
 
 base::string16 DownloadItemModel::GetProgressSizesString() const {
   base::string16 size_ratio;
-  int64 size = GetCompletedBytes();
-  int64 total = GetTotalBytes();
+  int64_t size = GetCompletedBytes();
+  int64_t total = GetTotalBytes();
   if (total > 0) {
     ui::DataUnits amount_units = ui::GetByteDisplayUnits(total);
     base::string16 simple_size = ui::FormatBytesWithUnits(size, amount_units, false);
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index 5cc4ddb..87555b4 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
@@ -5,10 +5,12 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 class SavePackage;
@@ -68,11 +70,11 @@ class DownloadItemModel {
   base::string16 GetWarningConfirmButtonText() const;
 
   // Get the number of bytes that has completed so far. Virtual for testing.
-  int64 GetCompletedBytes() const;
+  int64_t GetCompletedBytes() const;
 
   // Get the total number of bytes for this download. Should return 0 if the
   // total size of the download is not known. Virual for testing.
-  int64 GetTotalBytes() const;
+  int64_t GetTotalBytes() const;
 
   // Rough percent complete. Returns -1 if the progress is unknown.
   int PercentComplete() const;
diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc
index 7c63497..b129f04 100644
--- a/chrome/browser/download/download_item_model_unittest.cc
+++ b/chrome/browser/download/download_item_model_unittest.cc
@@ -4,10 +4,14 @@
 
 #include "chrome/browser/download/download_item_model.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
@@ -287,8 +291,8 @@ TEST_F(DownloadItemModelTest, InterruptTooltip) {
 
 TEST_F(DownloadItemModelTest, InProgressStatus) {
   const struct TestCase {
-    int64 received_bytes;               // Return value of GetReceivedBytes().
-    int64 total_bytes;                  // Return value of GetTotalBytes().
+    int64_t received_bytes;             // Return value of GetReceivedBytes().
+    int64_t total_bytes;                // Return value of GetTotalBytes().
     bool  time_remaining_known;         // If TimeRemaining() is known.
     bool  open_when_complete;           // GetOpenWhenComplete().
     bool  is_paused;                    // IsPaused().
diff --git a/chrome/browser/download/download_path_reservation_tracker.cc b/chrome/browser/download/download_path_reservation_tracker.cc
index 62424bf..6f5603e 100644
--- a/chrome/browser/download/download_path_reservation_tracker.cc
+++ b/chrome/browser/download/download_path_reservation_tracker.cc
@@ -4,17 +4,21 @@
 
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 
+#include <stddef.h>
+
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/third_party/icu/icu_utf.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
diff --git a/chrome/browser/download/download_path_reservation_tracker_unittest.cc b/chrome/browser/download/download_path_reservation_tracker_unittest.cc
index 902efcb..2a65597 100644
--- a/chrome/browser/download/download_path_reservation_tracker_unittest.cc
+++ b/chrome/browser/download/download_path_reservation_tracker_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ -10,6 +13,7 @@
 #include "base/observer_list.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_file_util.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/download/download_target_determiner.h"
 #include "content/public/test/mock_download_item.h"
@@ -35,7 +39,7 @@ class DownloadPathReservationTrackerTest : public testing::Test {
   void SetUp() override;
   void TearDown() override;
 
-  MockDownloadItem* CreateDownloadItem(int32 id);
+  MockDownloadItem* CreateDownloadItem(int32_t id);
   base::FilePath GetPathInDownloadsDirectory(
       const base::FilePath::CharType* suffix);
   bool IsPathInUse(const base::FilePath& path);
@@ -85,7 +89,7 @@ void DownloadPathReservationTrackerTest::TearDown() {
 }
 
 MockDownloadItem* DownloadPathReservationTrackerTest::CreateDownloadItem(
-    int32 id) {
+    int32_t id) {
   MockDownloadItem* item = new ::testing::StrictMock<MockDownloadItem>;
   EXPECT_CALL(*item, GetId())
       .WillRepeatedly(Return(id));
diff --git a/chrome/browser/download/download_permission_request.h b/chrome/browser/download/download_permission_request.h
index 09aed2a..d7a501a 100644
--- a/chrome/browser/download/download_permission_request.h
+++ b/chrome/browser/download/download_permission_request.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PERMISSION_REQUEST_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PERMISSION_REQUEST_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index f6a3209..6f2daef 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/download/download_prefs.h"
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
@@ -12,12 +14,14 @@
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_service.h"
diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h
index b3e7046..4b1eac3 100644
--- a/chrome/browser/download/download_prefs.h
+++ b/chrome/browser/download/download_prefs.h
@@ -8,7 +8,9 @@
 #include <set>
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/prefs/pref_member.h"
+#include "build/build_config.h"
 
 class PrefService;
 class Profile;
diff --git a/chrome/browser/download/download_query.h b/chrome/browser/download/download_query.h
index 22ea2bf..e81edc5 100644
--- a/chrome/browser/download/download_query.h
+++ b/chrome/browser/download/download_query.h
@@ -5,11 +5,14 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_QUERY_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_QUERY_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/download_item.h"
 
diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc
index 6947055..8ffc90a 100644
--- a/chrome/browser/download/download_query_unittest.cc
+++ b/chrome/browser/download/download_query_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ -10,11 +11,13 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_query.h"
 #include "content/public/test/mock_download_item.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/download/download_request_infobar_delegate_android.h b/chrome/browser/download/download_request_infobar_delegate_android.h
index 01b163f..41112e3 100644
--- a/chrome/browser/download/download_request_infobar_delegate_android.h
+++ b/chrome/browser/download/download_request_infobar_delegate_android.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_INFOBAR_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_INFOBAR_DELEGATE_ANDROID_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/download/download_request_infobar_delegate_unittest.cc b/chrome/browser/download/download_request_infobar_delegate_unittest.cc
index cbf9d69..1c1544a 100644
--- a/chrome/browser/download/download_request_infobar_delegate_unittest.cc
+++ b/chrome/browser/download/download_request_infobar_delegate_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_request_infobar_delegate_android.h"
diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h
index 4fa39dd..d621851 100644
--- a/chrome/browser/download/download_request_limiter.h
+++ b/chrome/browser/download/download_request_limiter.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_LIMITER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_LIMITER_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "components/content_settings/core/common/content_settings.h"
diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc
index 30071e6..113caca 100644
--- a/chrome/browser/download/download_request_limiter_unittest.cc
+++ b/chrome/browser/download/download_request_limiter_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/download/download_resource_throttle.cc b/chrome/browser/download/download_resource_throttle.cc
index a41df52..2c333df5 100644
--- a/chrome/browser/download/download_resource_throttle.cc
+++ b/chrome/browser/download/download_resource_throttle.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/download/download_resource_throttle.h"
 
 #include "base/bind.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_stats.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
diff --git a/chrome/browser/download/download_resource_throttle.h b/chrome/browser/download/download_resource_throttle.h
index 4798679..291f5f6 100644
--- a/chrome/browser/download/download_resource_throttle.h
+++ b/chrome/browser/download/download_resource_throttle.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_RESOURCE_THROTTLE_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_RESOURCE_THROTTLE_H_
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "content/public/browser/resource_throttle.h"
diff --git a/chrome/browser/download/download_service.h b/chrome/browser/download/download_service.h
index b492ee9..552256e 100644
--- a/chrome/browser/download/download_service.h
+++ b/chrome/browser/download/download_service.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SERVICE_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SERVICE_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/core/keyed_service.h"
 
diff --git a/chrome/browser/download/download_service_impl.cc b/chrome/browser/download/download_service_impl.cc
index a55c53a..89634ea 100644
--- a/chrome/browser/download/download_service_impl.cc
+++ b/chrome/browser/download/download_service_impl.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/download/download_service_impl.h"
 
 #include "base/callback.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_history.h"
diff --git a/chrome/browser/download/download_service_impl.h b/chrome/browser/download/download_service_impl.h
index 21eb635..e41f6ae 100644
--- a/chrome/browser/download/download_service_impl.h
+++ b/chrome/browser/download/download_service_impl.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SERVICE_IMPL_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SERVICE_IMPL_H_
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/download/download_service.h"
 #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index 80e14f9..d89775f 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -43,7 +43,7 @@ using content::DownloadItem;
 namespace {
 
 // Delay before we show a transient download.
-const int64 kDownloadShowDelayInSeconds = 2;
+const int64_t kDownloadShowDelayInSeconds = 2;
 
 // Get the opacity based on |animation_progress|, with values in [0.0, 1.0].
 // Range of return value is [0, 255].
@@ -229,7 +229,7 @@ void DownloadShelf::ShowDownload(DownloadItem* download) {
   }
 }
 
-void DownloadShelf::ShowDownloadById(int32 download_id) {
+void DownloadShelf::ShowDownloadById(int32_t download_id) {
   content::DownloadManager* download_manager = GetDownloadManager();
   if (!download_manager)
     return;
diff --git a/chrome/browser/download/download_shelf.h b/chrome/browser/download/download_shelf.h
index bf3de94..67d698d 100644
--- a/chrome/browser/download/download_shelf.h
+++ b/chrome/browser/download/download_shelf.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
 
+#include <stdint.h>
+
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ -138,7 +140,7 @@ class DownloadShelf {
   // Similar to ShowDownload() but refers to the download using an ID. This
   // download should belong to the DownloadManager returned by
   // GetDownloadManager().
-  void ShowDownloadById(int32 download_id);
+  void ShowDownloadById(int32_t download_id);
 
   bool should_show_on_unhide_;
   bool is_hidden_;
diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc
index 91a5728..441bf25 100644
--- a/chrome/browser/download/download_shelf_context_menu.cc
+++ b/chrome/browser/download/download_shelf_context_menu.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/download/download_shelf_context_menu.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/content_features.h"
diff --git a/chrome/browser/download/download_shelf_context_menu.h b/chrome/browser/download/download_shelf_context_menu.h
index 5119359..859aead 100644
--- a/chrome/browser/download/download_shelf_context_menu.h
+++ b/chrome/browser/download/download_shelf_context_menu.h
@@ -5,10 +5,11 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_commands.h"
 #include "content/public/browser/download_item.h"
 #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/download/download_started_animation.h b/chrome/browser/download/download_started_animation.h
index ea5d299..fe31baf 100644
--- a/chrome/browser/download/download_started_animation.h
+++ b/chrome/browser/download/download_started_animation.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STARTED_ANIMATION_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STARTED_ANIMATION_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace content {
 class WebContents;
diff --git a/chrome/browser/download/download_started_animation_browsertest.cc b/chrome/browser/download/download_started_animation_browsertest.cc
index f6163fb..2122ce2b 100644
--- a/chrome/browser/download/download_started_animation_browsertest.cc
+++ b/chrome/browser/download/download_started_animation_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/download/download_status_updater.cc b/chrome/browser/download/download_status_updater.cc
index 8ea221d..3c876aa 100644
--- a/chrome/browser/download/download_status_updater.cc
+++ b/chrome/browser/download/download_status_updater.cc
@@ -4,10 +4,14 @@
 
 #include "chrome/browser/download/download_status_updater.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
+#include "build/build_config.h"
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/views/linux_ui/linux_ui.h"
@@ -60,8 +64,8 @@ bool DownloadStatusUpdater::GetProgress(float* progress,
   *progress = 0;
   *download_count = 0;
   bool progress_certain = true;
-  int64 received_bytes = 0;
-  int64 total_bytes = 0;
+  int64_t received_bytes = 0;
+  int64_t total_bytes = 0;
 
   for (std::vector<AllDownloadItemNotifier*>::const_iterator it =
        notifiers_.begin(); it != notifiers_.end(); ++it) {
diff --git a/chrome/browser/download/download_status_updater.h b/chrome/browser/download/download_status_updater.h
index 1dfd4ba..8964b55 100644
--- a/chrome/browser/download/download_status_updater.h
+++ b/chrome/browser/download/download_status_updater.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
diff --git a/chrome/browser/download/download_status_updater_unittest.cc b/chrome/browser/download/download_status_updater_unittest.cc
index 0a83cb8..7cc2334 100644
--- a/chrome/browser/download/download_status_updater_unittest.cc
+++ b/chrome/browser/download/download_status_updater_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/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 99bcd7f..32d6563 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -11,6 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_extensions.h"
diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
index 0bb4cb0..6734d8d 100644
--- a/chrome/browser/download/download_target_determiner.h
+++ b/chrome/browser/download/download_target_determiner.h
@@ -6,10 +6,12 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_
 
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/download/download_target_determiner_delegate.h"
 #include "chrome/browser/download/download_target_info.h"
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
index 93268f3..cd3f8aa 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -2,10 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/at_exit.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
@@ -14,6 +18,7 @@
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/value_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_prefs.h"
@@ -202,7 +207,7 @@ class DownloadTargetDeterminerTest : public ChromeRenderViewHostTestHarness {
 
   // Creates MockDownloadItem and sets up default expectations.
   content::MockDownloadItem* CreateActiveDownloadItem(
-      int32 id,
+      int32_t id,
       const DownloadTestCase& test_case);
 
   // Sets the AutoOpenBasedOnExtension user preference for |path|.
@@ -283,7 +288,7 @@ void DownloadTargetDeterminerTest::TearDown() {
 
 content::MockDownloadItem*
 DownloadTargetDeterminerTest::CreateActiveDownloadItem(
-    int32 id,
+    int32_t id,
     const DownloadTestCase& test_case) {
   content::MockDownloadItem* item =
       new ::testing::NiceMock<content::MockDownloadItem>();
diff --git a/chrome/browser/download/download_ui_controller.cc b/chrome/browser/download/download_ui_controller.cc
index 4c0b1c9..9068ef8 100644
--- a/chrome/browser/download/download_ui_controller.cc
+++ b/chrome/browser/download/download_ui_controller.cc
@@ -6,6 +6,7 @@
 
 #include "base/callback.h"
 #include "base/stl_util.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/download/download_ui_controller.h b/chrome/browser/download/download_ui_controller.h
index 767b87c..e0f58a4 100644
--- a/chrome/browser/download/download_ui_controller.h
+++ b/chrome/browser/download/download_ui_controller.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
 
diff --git a/chrome/browser/download/drag_download_item_views.cc b/chrome/browser/download/drag_download_item_views.cc
index b32cfc3..1859647 100644
--- a/chrome/browser/download/drag_download_item_views.cc
+++ b/chrome/browser/download/drag_download_item_views.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/download_item.h"
 #include "net/base/mime_util.h"
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc
index afcbabd..f26854f 100644
--- a/chrome/browser/download/notification/download_item_notification.cc
+++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -4,9 +4,13 @@
 
 #include "chrome/browser/download/notification/download_item_notification.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/files/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
@@ -55,7 +59,7 @@ const SkColor kImageBackgroundColor = SK_ColorWHITE;
 
 // Maximum size of preview image. If the image exceeds this size, don't show the
 // preview image.
-const int64 kMaxImagePreviewSize = 10 * 1024 * 1024;  // 10 MB
+const int64_t kMaxImagePreviewSize = 10 * 1024 * 1024;  // 10 MB
 
 std::string ReadNotificationImage(const base::FilePath& file_path) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
diff --git a/chrome/browser/download/notification/download_item_notification.h b/chrome/browser/download/notification/download_item_notification.h
index 50f87ef..760686d 100644
--- a/chrome/browser/download/notification/download_item_notification.h
+++ b/chrome/browser/download/notification/download_item_notification.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_
 #define CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_
 
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/download/download_commands.h"
 #include "chrome/browser/download/notification/download_notification.h"
diff --git a/chrome/browser/download/notification/download_item_notification_unittest.cc b/chrome/browser/download/notification/download_item_notification_unittest.cc
index e664891..635483d 100644
--- a/chrome/browser/download/notification/download_item_notification_unittest.cc
+++ b/chrome/browser/download/notification/download_item_notification_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/download/notification/download_item_notification.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/download/notification/download_notification.cc b/chrome/browser/download/notification/download_notification.cc
index 6f27c5a..e82ea57 100644
--- a/chrome/browser/download/notification/download_notification.cc
+++ b/chrome/browser/download/notification/download_notification.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/download/notification/download_notification.h"
 
+#include "base/macros.h"
 #include "chrome/browser/download/notification/download_notification_manager.h"
 
 namespace {
diff --git a/chrome/browser/download/notification/download_notification.h b/chrome/browser/download/notification/download_notification.h
index 5e25e91..3f1a1a4 100644
--- a/chrome/browser/download/notification/download_notification.h
+++ b/chrome/browser/download/notification/download_notification.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_H_
 #define CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_H_
 
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/download/download_commands.h"
 #include "chrome/browser/notifications/notification.h"
diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc
index a04323e..3293f97 100644
--- a/chrome/browser/download/notification/download_notification_browsertest.cc
+++ b/chrome/browser/download/notification/download_notification_browsertest.cc
@@ -2,7 +2,10 @@
 // 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/command_line.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc
index cd70d40..d6486c9 100644
--- a/chrome/browser/download/save_package_file_picker.cc
+++ b/chrome/browser/download/save_package_file_picker.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/download/save_package_file_picker.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/file_util_icu.h"
@@ -11,6 +13,7 @@
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/download/save_package_file_picker.h b/chrome/browser/download/save_package_file_picker.h
index 05a53a5..628089e 100644
--- a/chrome/browser/download/save_package_file_picker.h
+++ b/chrome/browser/download/save_package_file_picker.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/save_page_type.h"
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index b4293b8..aba1d70 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -11,6 +14,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
@@ -18,6 +22,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
+#include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_history.h"
@@ -130,7 +135,7 @@ class DownloadPersistedObserver : public DownloadHistory::Observer {
 // Waits for an item record to be removed from the downloads database.
 class DownloadRemovedObserver : public DownloadPersistedObserver {
  public:
-  DownloadRemovedObserver(Profile* profile, int32 download_id)
+  DownloadRemovedObserver(Profile* profile, int32_t download_id)
       : DownloadPersistedObserver(profile, PersistedFilter()),
         removed_(false),
         download_id_(download_id) {}
@@ -158,18 +163,17 @@ class DownloadRemovedObserver : public DownloadPersistedObserver {
  private:
   bool removed_;
   base::Closure quit_waiting_callback_;
-  int32 download_id_;
+  int32_t download_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadRemovedObserver);
 };
 
-bool DownloadStoredProperly(
-    const GURL& expected_url,
-    const base::FilePath& expected_path,
-    int64 num_files,
-    history::DownloadState expected_state,
-    DownloadItem* item,
-    const history::DownloadRow& info) {
+bool DownloadStoredProperly(const GURL& expected_url,
+                            const base::FilePath& expected_path,
+                            int64_t num_files,
+                            history::DownloadState expected_state,
+                            DownloadItem* item,
+                            const history::DownloadRow& info) {
   // This function may be called multiple times for a given test. Returning
   // false doesn't necessarily mean that the test has failed or will fail, it
   // might just mean that the test hasn't passed yet.
@@ -697,7 +701,7 @@ SavePageAsMHTMLBrowserTest::~SavePageAsMHTMLBrowserTest() {
 }
 
 IN_PROC_BROWSER_TEST_F(SavePageAsMHTMLBrowserTest, SavePageAsMHTML) {
-  static const int64 kFileSizeMin = 2758;
+  static const int64_t kFileSizeMin = 2758;
   GURL url = NavigateToMockURL("b");
   base::FilePath download_dir = DownloadPrefs::FromDownloadManager(
       GetDownloadManager())->DownloadPath();
@@ -718,7 +722,7 @@ IN_PROC_BROWSER_TEST_F(SavePageAsMHTMLBrowserTest, SavePageAsMHTML) {
   persisted.WaitForPersisted();
 
   ASSERT_TRUE(base::PathExists(full_file_name));
-  int64 actual_file_size = -1;
+  int64_t actual_file_size = -1;
   EXPECT_TRUE(base::GetFileSize(full_file_name, &actual_file_size));
   EXPECT_LE(kFileSizeMin, actual_file_size);
 }
@@ -823,7 +827,7 @@ IN_PROC_BROWSER_TEST_F(SavePageSitePerProcessBrowserTest, SaveAsCompleteHtml) {
   for (auto file_path : expected_files) {
     EXPECT_TRUE(base::PathExists(file_path)) << "Does " << file_path.value()
                                              << " exist?";
-    int64 actual_file_size = 0;
+    int64_t actual_file_size = 0;
     EXPECT_TRUE(base::GetFileSize(file_path, &actual_file_size));
     EXPECT_NE(0, actual_file_size) << "Is " << file_path.value()
                                    << " non-empty?";
diff --git a/chrome/browser/download/test_download_shelf.h b/chrome/browser/download/test_download_shelf.h
index a6151c5..7617c05 100644
--- a/chrome/browser/download/test_download_shelf.h
+++ b/chrome/browser/download/test_download_shelf.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_TEST_DOWNLOAD_SHELF_H_
 #define CHROME_BROWSER_DOWNLOAD_TEST_DOWNLOAD_SHELF_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "content/public/browser/download_manager.h"
author	avi <avi@chromium.org>	2015-12-25 16:59:18 -0800
committer	Commit bot <commit-bot@chromium.org>	2015-12-26 01:00:22 +0000
commit	e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a (patch)
tree	478f750ec499a805e00faa000e9353b28e6ff200
parent	2606292a9f46c507f23d878f22b7359a11c1e123 (diff)
download	chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.zip chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.gz chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.bz2