Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index d4f4c98fc2a3b794b2bdd80725692f691676e60c..1f88159347e8e4db74ce702511a519c7ca4a3195 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -4,9 +4,10 @@ |
#include "chrome/browser/profiles/profile_io_data.h" |
+#include <stddef.h> |
+ |
#include <string> |
-#include "base/basictypes.h" |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/callback.h" |
@@ -14,6 +15,7 @@ |
#include "base/compiler_specific.h" |
#include "base/debug/alias.h" |
#include "base/logging.h" |
+#include "base/macros.h" |
#include "base/path_service.h" |
#include "base/prefs/pref_service.h" |
#include "base/stl_util.h" |
@@ -22,6 +24,7 @@ |
#include "base/strings/stringprintf.h" |
#include "base/thread_task_runner_handle.h" |
#include "base/threading/sequenced_worker_pool.h" |
+#include "build/build_config.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/content_settings/cookie_settings_factory.h" |
@@ -964,7 +967,7 @@ ProfileIOData::ResourceContext::CreateClientCertStore() { |
} |
void ProfileIOData::ResourceContext::CreateKeygenHandler( |
- uint32 key_size_in_bits, |
+ uint32_t key_size_in_bits, |
const std::string& challenge_string, |
const GURL& url, |
const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) { |