diff options
| author | avi <avi@chromium.org> | 2015-12-25 18:10:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 02:11:32 +0000 |
| commit | b896c715dd14ec1f7ac800350b40eeb6de2ba868 (patch) | |
| tree | acc471478046a775c3492046a40c2ea84e8ea88a /chrome/browser | |
| parent | f5b61be8a18b07a2a928f10bf1f8f0e8a5358f13 (diff) | |
| download | chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.zip chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.gz chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.bz2 | |
Switch to standard integer types in chrome/browser/, part 3 of 4.
BUG=138542
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1548133002
Cr-Commit-Position: refs/heads/master@{#366883}
Diffstat (limited to 'chrome/browser')
579 files changed, 1573 insertions, 647 deletions
diff --git a/chrome/browser/obsolete_system/obsolete_system.h b/chrome/browser/obsolete_system/obsolete_system.h index 846dba0..2abc413 100644 --- a/chrome/browser/obsolete_system/obsolete_system.h +++ b/chrome/browser/obsolete_system/obsolete_system.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_OBSOLETE_SYSTEM_OBSOLETE_SYSTEM_H_ #define CHROME_BROWSER_OBSOLETE_SYSTEM_OBSOLETE_SYSTEM_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" class ObsoleteSystem { diff --git a/chrome/browser/obsolete_system/obsolete_system_linux.cc b/chrome/browser/obsolete_system/obsolete_system_linux.cc index 4e34322..5da7998 100644 --- a/chrome/browser/obsolete_system/obsolete_system_linux.cc +++ b/chrome/browser/obsolete_system/obsolete_system_linux.cc @@ -4,6 +4,10 @@ #include "chrome/browser/obsolete_system/obsolete_system.h" +#include <stdint.h> + +#include "build/build_config.h" + #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> diff --git a/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h index 6ae1a85..172b8be 100644 --- a/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h +++ b/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_ABORTS_PAGE_LOAD_METRICS_OBSERVER_H_ #define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_ABORTS_PAGE_LOAD_METRICS_OBSERVER_H_ +#include "base/macros.h" #include "components/page_load_metrics/browser/page_load_metrics_observer.h" namespace internal { diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc index e59f186..ac68b5f 100644 --- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc +++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_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 "chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc index f0a0bfc..24b5589 100644 --- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc +++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc @@ -4,6 +4,7 @@ #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/page_load_metrics/common/page_load_metrics_messages.h" diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h index cfa4412..c2abae4 100644 --- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h +++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_PAGE_LOAD_METRICS_OBSERVER_TEST_HARNESS_H_ #define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_PAGE_LOAD_METRICS_OBSERVER_TEST_HARNESS_H_ +#include "base/macros.h" #include "base/test/histogram_tester.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/page_load_metrics/browser/metrics_web_contents_observer.h" diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc index 897e062..74d9f81 100644 --- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_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/test/histogram_tester.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/password_manager/account_chooser_dialog_android.cc b/chrome/browser/password_manager/account_chooser_dialog_android.cc index 4321e97..6b75669 100644 --- a/chrome/browser/password_manager/account_chooser_dialog_android.cc +++ b/chrome/browser/password_manager/account_chooser_dialog_android.cc @@ -7,6 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "chrome/browser/password_manager/chrome_password_manager_client.h" #include "chrome/browser/password_manager/credential_android.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/account_chooser_dialog_android.h b/chrome/browser/password_manager/account_chooser_dialog_android.h index ed193ca..4b7d540 100644 --- a/chrome/browser/password_manager/account_chooser_dialog_android.h +++ b/chrome/browser/password_manager/account_chooser_dialog_android.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ACCOUNT_CHOOSER_DIALOG_ANDROID_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_ACCOUNT_CHOOSER_DIALOG_ANDROID_H_ +#include <stddef.h> + #include <vector> #include "base/android/jni_android.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "chrome/browser/ui/passwords/manage_passwords_state.h" diff --git a/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc b/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc index 911c4aa..908aaa4 100644 --- a/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc +++ b/chrome/browser/password_manager/auto_signin_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/prefs/pref_service.h" #include "chrome/browser/password_manager/auto_signin_first_run_infobar_delegate.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc index 9a795e9..d25440f 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc @@ -13,6 +13,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h index 1bbe064..c9150e2 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_member.h" diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc index c4c53e5..000060f 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc @@ -4,9 +4,12 @@ #include "chrome/browser/password_manager/chrome_password_manager_client.h" +#include <stdint.h> + #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" @@ -122,7 +125,7 @@ ChromePasswordManagerClient* ChromePasswordManagerClientTest::GetClient() { bool ChromePasswordManagerClientTest::WasLoggingActivationMessageSent( bool* activation_flag) { - const uint32 kMsgID = AutofillMsg_SetLoggingState::ID; + const uint32_t kMsgID = AutofillMsg_SetLoggingState::ID; const IPC::Message* message = process()->sink().GetFirstMessageMatching(kMsgID); if (!message) diff --git a/chrome/browser/password_manager/credential_android.h b/chrome/browser/password_manager/credential_android.h index 6f450e183..004abc3f 100644 --- a/chrome/browser/password_manager/credential_android.h +++ b/chrome/browser/password_manager/credential_android.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_CREDENTIAL_ANDROID_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_CREDENTIAL_ANDROID_H_ +#include <stddef.h> + #include "base/android/jni_array.h" #include "base/android/scoped_java_ref.h" #include "components/autofill/core/common/password_form.h" diff --git a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc index 4a2a8c1..fdae9fd 100644 --- a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc +++ b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc @@ -4,7 +4,7 @@ #include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h" -#include <cstddef> +#include <stddef.h> #include "base/strings/utf_string_conversions.h" #include "chrome/browser/android/chrome_application.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index 7e3fbcf..0a225a3 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -6,12 +6,13 @@ #include <dlfcn.h> #include <gnome-keyring.h> +#include <stddef.h> +#include <stdint.h> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -134,7 +135,7 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) { form->signon_realm = string_attr_map["signon_realm"]; form->ssl_valid = uint_attr_map["ssl_valid"]; form->preferred = uint_attr_map["preferred"]; - int64 date_created = 0; + int64_t date_created = 0; bool date_ok = base::StringToInt64(string_attr_map["date_created"], &date_created); DCHECK(date_ok); @@ -151,7 +152,7 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) { form->type = static_cast<PasswordForm::Type>(uint_attr_map["type"]); form->times_used = uint_attr_map["times_used"]; form->scheme = static_cast<PasswordForm::Scheme>(uint_attr_map["scheme"]); - int64 date_synced = 0; + int64_t date_synced = 0; base::StringToInt64(string_attr_map["date_synced"], &date_synced); form->date_synced = base::Time::FromInternalValue(date_synced); form->display_name = UTF8ToUTF16(string_attr_map["display_name"]); @@ -335,12 +336,12 @@ class GKRMethod : public GnomeKeyringLoader { void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - int64 date_created = form.date_created.ToInternalValue(); + int64_t date_created = form.date_created.ToInternalValue(); // If we are asked to save a password with 0 date, use the current time. // We don't want to actually save passwords as though on January 1, 1601. if (!date_created) date_created = base::Time::Now().ToInternalValue(); - int64 date_synced = form.date_synced.ToInternalValue(); + int64_t date_synced = form.date_synced.ToInternalValue(); std::string form_data; SerializeFormDataToBase64String(form.form_data, &form_data); gnome_keyring_store_password( diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h index d7ae092..6042c99 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.h +++ b/chrome/browser/password_manager/native_backend_gnome_x.h @@ -19,8 +19,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index c387919..c387724c 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include <stdarg.h> +#include <stddef.h> +#include <stdint.h> -#include "base/basictypes.h" #include "base/location.h" #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 37c18cb..5c7db54 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -4,6 +4,9 @@ #include "chrome/browser/password_manager/native_backend_kwallet_x.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -148,7 +151,7 @@ bool DeserializeValueSize(const std::string& signon_realm, form->signon_realm.assign(signon_realm); int scheme = 0; - int64 date_created = 0; + int64_t date_created = 0; int type = 0; int generation_upload_status = 0; // Note that these will be read back in the order listed due to @@ -181,7 +184,7 @@ bool DeserializeValueSize(const std::string& signon_realm, } if (version > 2) { - int64 date_synced = 0; + int64_t date_synced = 0; if (!iter.ReadInt64(&date_synced)) { LogDeserializationWarning(version, signon_realm, false); return false; diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h index bb634668..e2d6ece 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.h +++ b/chrome/browser/password_manager/native_backend_kwallet_x.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/nix/xdg_util.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 9f23b0d..d6394b3 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_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 <map> #include <set> diff --git a/chrome/browser/password_manager/native_backend_libsecret.cc b/chrome/browser/password_manager/native_backend_libsecret.cc index a0d81ef..5ad849b 100644 --- a/chrome/browser/password_manager/native_backend_libsecret.cc +++ b/chrome/browser/password_manager/native_backend_libsecret.cc @@ -5,9 +5,10 @@ #include "chrome/browser/password_manager/native_backend_libsecret.h" #include <dlfcn.h> +#include <stddef.h> +#include <stdint.h> #include <list> -#include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -160,7 +161,7 @@ scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) { form->signon_realm = GetStringFromAttributes(attrs, "signon_realm"); form->ssl_valid = GetUintFromAttributes(attrs, "ssl_valid"); form->preferred = GetUintFromAttributes(attrs, "preferred"); - int64 date_created = 0; + int64_t date_created = 0; bool date_ok = base::StringToInt64( GetStringFromAttributes(attrs, "date_created"), &date_created); DCHECK(date_ok); @@ -180,7 +181,7 @@ scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) { form->times_used = GetUintFromAttributes(attrs, "times_used"); form->scheme = static_cast<PasswordForm::Scheme>(GetUintFromAttributes(attrs, "scheme")); - int64 date_synced = 0; + int64_t date_synced = 0; base::StringToInt64(GetStringFromAttributes(attrs, "date_synced"), &date_synced); form->date_synced = base::Time::FromInternalValue(date_synced); @@ -210,7 +211,7 @@ class LibsecretAttributesBuilder { LibsecretAttributesBuilder(); ~LibsecretAttributesBuilder(); void Append(const std::string& name, const std::string& value); - void Append(const std::string& name, int64 value); + void Append(const std::string& name, int64_t value); // GHashTable, its keys and values returned from Get() are destroyed in // |LibsecretAttributesBuilder| desctructor. GHashTable* Get() { return attrs_; } @@ -242,7 +243,8 @@ void LibsecretAttributesBuilder::Append(const std::string& name, g_hash_table_insert(attrs_, name_str, value_str); } -void LibsecretAttributesBuilder::Append(const std::string& name, int64 value) { +void LibsecretAttributesBuilder::Append(const std::string& name, + int64_t value) { Append(name, base::Int64ToString(value)); } @@ -433,12 +435,12 @@ bool NativeBackendLibsecret::AddUpdateLoginSearch( } bool NativeBackendLibsecret::RawAddLogin(const PasswordForm& form) { - int64 date_created = form.date_created.ToInternalValue(); + int64_t date_created = form.date_created.ToInternalValue(); // If we are asked to save a password with 0 date, use the current time. // We don't want to actually save passwords as though on January 1, 1601. if (!date_created) date_created = base::Time::Now().ToInternalValue(); - int64 date_synced = form.date_synced.ToInternalValue(); + int64_t date_synced = form.date_synced.ToInternalValue(); std::string form_data; SerializeFormDataToBase64String(form.form_data, &form_data); GError* error = nullptr; diff --git a/chrome/browser/password_manager/native_backend_libsecret.h b/chrome/browser/password_manager/native_backend_libsecret.h index 3acc55f..9e21ef8 100644 --- a/chrome/browser/password_manager/native_backend_libsecret.h +++ b/chrome/browser/password_manager/native_backend_libsecret.h @@ -9,8 +9,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc index c68673e..a710b4f 100644 --- a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc +++ b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include <stdarg.h> +#include <stddef.h> +#include <stdint.h> -#include "base/basictypes.h" #include "base/location.h" #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index b687d26..a099b21 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -5,6 +5,7 @@ #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" @@ -12,6 +13,7 @@ #include "base/stl_util.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/password_manager/chrome_password_manager_client.h" #include "chrome/browser/password_manager/password_manager_test_base.h" diff --git a/chrome/browser/password_manager/password_manager_infobar_delegate.h b/chrome/browser/password_manager/password_manager_infobar_delegate.h index 9314db4..edcffe6 100644 --- a/chrome/browser/password_manager/password_manager_infobar_delegate.h +++ b/chrome/browser/password_manager/password_manager_infobar_delegate.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_INFOBAR_DELEGATE_H_ +#include "base/macros.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "ui/gfx/range/range.h" diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc index d7fe6bd..7661d4f 100644 --- a/chrome/browser/password_manager/password_manager_test_base.cc +++ b/chrome/browser/password_manager/password_manager_test_base.cc @@ -7,6 +7,7 @@ #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/password_manager/password_manager_test_base.h b/chrome/browser/password_manager/password_manager_test_base.h index dc1763d..b8cf4d2 100644 --- a/chrome/browser/password_manager/password_manager_test_base.h +++ b/chrome/browser/password_manager/password_manager_test_base.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_TEST_BASE_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_TEST_BASE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/password_manager/password_manager_util_mac.mm b/chrome/browser/password_manager/password_manager_util_mac.mm index b1a2283..832228b 100644 --- a/chrome/browser/password_manager/password_manager_util_mac.mm +++ b/chrome/browser/password_manager/password_manager_util_mac.mm @@ -8,10 +8,10 @@ #import <Foundation/Foundation.h> #include <Security/Authorization.h> -#include "base/basictypes.h" #include "base/mac/authorization_util.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_authorizationref.h" +#include "base/macros.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc index cc5371f..d179760 100644 --- a/chrome/browser/password_manager/password_manager_util_win.cc +++ b/chrome/browser/password_manager/password_manager_util_win.cc @@ -5,6 +5,8 @@ // windows.h must be first otherwise Win8 SDK breaks. #include <windows.h> #include <LM.h> +#include <stddef.h> +#include <stdint.h> #include <wincred.h> // SECURITY_WIN32 must be defined in order to get @@ -65,7 +67,7 @@ struct PasswordCheckPrefs { void Read(PrefService* local_state); void Write(PrefService* local_state); - int64 pref_last_changed_; + int64_t pref_last_changed_; bool blank_password_; }; @@ -83,7 +85,7 @@ void PasswordCheckPrefs::Write(PrefService* local_state) { pref_last_changed_); } -int64 GetPasswordLastChanged(const WCHAR* username) { +int64_t GetPasswordLastChanged(const WCHAR* username) { LPUSER_INFO_1 user_info = NULL; DWORD age = 0; @@ -104,7 +106,7 @@ int64 GetPasswordLastChanged(const WCHAR* username) { bool CheckBlankPasswordWithPrefs(const WCHAR* username, PasswordCheckPrefs* prefs) { - int64 last_changed = GetPasswordLastChanged(username); + int64_t last_changed = GetPasswordLastChanged(username); // If we cannot determine when the password was last changed // then assume the password is not blank diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index 2048d88..1830a22 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -11,6 +11,7 @@ #include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/sync_start_util.h" diff --git a/chrome/browser/password_manager/password_store_factory.h b/chrome/browser/password_manager/password_store_factory.h index 07c0246..6c0df54 100644 --- a/chrome/browser/password_manager/password_store_factory.h +++ b/chrome/browser/password_manager/password_store_factory.h @@ -7,8 +7,9 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h" #include "components/keyed_service/core/service_access_type.h" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 13f09dc..15fa9ec 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/password_manager/password_store_mac.h" -#include "chrome/browser/password_manager/password_store_mac_internal.h" #include <CoreServices/CoreServices.h> +#include <stddef.h> #include <set> #include <string> #include <utility> @@ -15,12 +15,14 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/mac/security_wrappers.h" +#include "chrome/browser/password_manager/password_store_mac_internal.h" #include "components/os_crypt/os_crypt.h" #include "components/password_manager/core/browser/affiliation_utils.h" #include "components/password_manager/core/browser/login_database.h" diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h index 11be407..32ea3df 100644 --- a/chrome/browser/password_manager/password_store_mac.h +++ b/chrome/browser/password_manager/password_store_mac.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/threading/thread.h" diff --git a/chrome/browser/password_manager/password_store_mac_internal.h b/chrome/browser/password_manager/password_store_mac_internal.h index 47ec33c..52cbd00 100644 --- a/chrome/browser/password_manager/password_store_mac_internal.h +++ b/chrome/browser/password_manager/password_store_mac_internal.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "components/autofill/core/common/password_form.h" #include "crypto/apple_keychain.h" diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 69b0c77..d841e35 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -4,10 +4,12 @@ #include "chrome/browser/password_manager/password_store_mac.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/stl_util.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/password_manager/password_store_proxy_mac.h b/chrome/browser/password_manager/password_store_proxy_mac.h index 5c21509..5abe0e00 100644 --- a/chrome/browser/password_manager/password_store_proxy_mac.h +++ b/chrome/browser/password_manager/password_store_proxy_mac.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "base/threading/thread.h" #include "components/password_manager/core/browser/keychain_migration_status_mac.h" diff --git a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc index 204c9c7..d4a0d56 100644 --- a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/password_manager/password_store_proxy_mac.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/test/histogram_tester.h" diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc index db9076f..aa4a6e9 100644 --- a/chrome/browser/password_manager/password_store_win.cc +++ b/chrome/browser/password_manager/password_store_win.cc @@ -4,11 +4,14 @@ #include "chrome/browser/password_manager/password_store_win.h" +#include <stddef.h> + #include <map> #include <vector> #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h index 6287177..c096e4b 100644 --- a/chrome/browser/password_manager/password_store_win.h +++ b/chrome/browser/password_manager/password_store_win.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/password_manager/core/browser/password_store_default.h" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 16208a7..54e01d0 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/scoped_temp_dir.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/password_manager/password_store_x.h b/chrome/browser/password_manager/password_store_x.h index 0244849..dbd1c33 100644 --- a/chrome/browser/password_manager/password_store_x.h +++ b/chrome/browser/password_manager/password_store_x.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index c951407..e524679 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.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/bind.h" #include "base/bind_helpers.h" #include "base/files/file_util.h" diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.h b/chrome/browser/password_manager/save_password_infobar_delegate.h index 4dcf7fad..14f7a71 100644 --- a/chrome/browser/password_manager/save_password_infobar_delegate.h +++ b/chrome/browser/password_manager/save_password_infobar_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_SAVE_PASSWORD_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_SAVE_PASSWORD_INFOBAR_DELEGATE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/password_manager/password_manager_infobar_delegate.h" diff --git a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc index 4b9aaa6..dfad7a7 100644 --- a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc +++ b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/simple_password_store_mac.h b/chrome/browser/password_manager/simple_password_store_mac.h index f61e723..0f36dd2 100644 --- a/chrome/browser/password_manager/simple_password_store_mac.h +++ b/chrome/browser/password_manager/simple_password_store_mac.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_SIMPLE_PASSWORD_STORE_MAC_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_SIMPLE_PASSWORD_STORE_MAC_H_ +#include "base/macros.h" #include "components/password_manager/core/browser/password_store_default.h" // The same as PasswordStoreDefault but running on the dedicated thread. The diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc index 7c2d69b..954598a 100644 --- a/chrome/browser/pdf/pdf_extension_test.cc +++ b/chrome/browser/pdf/pdf_extension_test.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/base_paths.h" @@ -9,9 +11,11 @@ #include "base/files/file_util.h" #include "base/hash.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h index 0434729..3b03de4 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.h +++ b/chrome/browser/pepper_broker_infobar_delegate.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "url/gurl.h" diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index b40c86d..e319afe 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -14,6 +14,7 @@ #include "base/prefs/pref_service.h" #include "base/sequenced_task_runner_helpers.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/renderer_host/pepper/device_id_fetcher.h" @@ -45,23 +46,22 @@ class PepperFlashSettingsManager::Core // be called any more. void Detach(); - void DeauthorizeContentLicenses(uint32 request_id); + void DeauthorizeContentLicenses(uint32_t request_id); void GetPermissionSettings( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type); - void SetDefaultPermission( - uint32 request_id, - PP_Flash_BrowserOperations_SettingType setting_type, - PP_Flash_BrowserOperations_Permission permission, - bool clear_site_specific); - void SetSitePermission(uint32 request_id, + void SetDefaultPermission(uint32_t request_id, + PP_Flash_BrowserOperations_SettingType setting_type, + PP_Flash_BrowserOperations_Permission permission, + bool clear_site_specific); + void SetSitePermission(uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites); - void GetSitesWithData(uint32 request_id); - void ClearSiteData(uint32 request_id, + void GetSitesWithData(uint32_t request_id); + void ClearSiteData(uint32_t request_id, const std::string& site, - uint64 flags, - uint64 max_age); + uint64_t flags, + uint64_t max_age); // IPC::Listener implementation. bool OnMessageReceived(const IPC::Message& message) override; @@ -99,7 +99,7 @@ class PepperFlashSettingsManager::Core max_age(0) { } - uint32 id; + uint32_t id; RequestType type; // Used by GET_PERMISSION_SETTINGS, SET_DEFAULT_PERMISSION and @@ -115,8 +115,8 @@ class PepperFlashSettingsManager::Core // Used by CLEAR_SITE_DATA std::string site; - uint64 flags; - uint64 max_age; + uint64_t flags; + uint64_t max_age; }; ~Core() override; @@ -124,60 +124,60 @@ class PepperFlashSettingsManager::Core void ConnectToChannel(bool success, const IPC::ChannelHandle& handle); void InitializeOnIOThread(); - void DeauthorizeContentLicensesOnIOThread(uint32 request_id); + void DeauthorizeContentLicensesOnIOThread(uint32_t request_id); void DeauthorizeContentLicensesOnBlockingPool( - uint32 request_id, + uint32_t request_id, const base::FilePath& profile_path); - void DeauthorizeContentLicensesInPlugin(uint32 request_id, bool success); + void DeauthorizeContentLicensesInPlugin(uint32_t request_id, bool success); void GetPermissionSettingsOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type); void SetDefaultPermissionOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific); void SetSitePermissionOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites); - void GetSitesWithDataOnIOThread(uint32 request_id); - void ClearSiteDataOnIOThread(uint32 request_id, + void GetSitesWithDataOnIOThread(uint32_t request_id); + void ClearSiteDataOnIOThread(uint32_t request_id, const std::string& site, - uint64 flags, - uint64 max_age); + uint64_t flags, + uint64_t max_age); void DetachOnIOThread(); void NotifyErrorFromIOThread(); - void NotifyDeauthorizeContentLicensesCompleted(uint32 request_id, + void NotifyDeauthorizeContentLicensesCompleted(uint32_t request_id, bool success); void NotifyGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites); - void NotifySetDefaultPermissionCompleted(uint32 request_id, bool success); - void NotifySetSitePermissionCompleted(uint32 request_id, bool success); - void NotifyGetSitesWithDataCompleted(uint32 request_id, + void NotifySetDefaultPermissionCompleted(uint32_t request_id, bool success); + void NotifySetSitePermissionCompleted(uint32_t request_id, bool success); + void NotifyGetSitesWithDataCompleted(uint32_t request_id, const std::vector<std::string>& sites); - void NotifyClearSiteDataCompleted(uint32 request_id, bool success); + void NotifyClearSiteDataCompleted(uint32_t request_id, bool success); void NotifyError( - const std::vector<std::pair<uint32, RequestType> >& notifications); + const std::vector<std::pair<uint32_t, RequestType>>& notifications); // Message handlers. - void OnDeauthorizeContentLicensesResult(uint32 request_id, bool success); + void OnDeauthorizeContentLicensesResult(uint32_t request_id, bool success); void OnGetPermissionSettingsResult( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites); - void OnSetDefaultPermissionResult(uint32 request_id, bool success); - void OnSetSitePermissionResult(uint32 request_id, bool success); - void OnGetSitesWithDataResult(uint32 request_id, + void OnSetDefaultPermissionResult(uint32_t request_id, bool success); + void OnSetSitePermissionResult(uint32_t request_id, bool success); + void OnGetSitesWithDataResult(uint32_t request_id, const std::vector<std::string>& sites); - void OnClearSiteDataResult(uint32 request_id, bool success); + void OnClearSiteDataResult(uint32_t request_id, bool success); // Used only on the UI thread. base::WeakPtr<PepperFlashSettingsManager> manager_; @@ -197,7 +197,7 @@ class PepperFlashSettingsManager::Core std::vector<PendingRequest> pending_requests_; // Requests that have been sent but haven't got replied. Used only on the // I/O thread. - std::map<uint32, RequestType> pending_responses_; + std::map<uint32_t, RequestType> pending_responses_; // Used only on the I/O thread. scoped_refptr<content::PepperFlashSettingsHelper> helper_; @@ -243,7 +243,7 @@ void PepperFlashSettingsManager::Core::Detach() { } void PepperFlashSettingsManager::Core::DeauthorizeContentLicenses( - uint32 request_id) { + uint32_t request_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( @@ -253,7 +253,7 @@ void PepperFlashSettingsManager::Core::DeauthorizeContentLicenses( } void PepperFlashSettingsManager::Core::GetPermissionSettings( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -264,7 +264,7 @@ void PepperFlashSettingsManager::Core::GetPermissionSettings( } void PepperFlashSettingsManager::Core::SetDefaultPermission( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific) { @@ -277,7 +277,7 @@ void PepperFlashSettingsManager::Core::SetDefaultPermission( } void PepperFlashSettingsManager::Core::SetSitePermission( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -288,7 +288,7 @@ void PepperFlashSettingsManager::Core::SetSitePermission( setting_type, sites)); } -void PepperFlashSettingsManager::Core::GetSitesWithData(uint32 request_id) { +void PepperFlashSettingsManager::Core::GetSitesWithData(uint32_t request_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( @@ -296,10 +296,10 @@ void PepperFlashSettingsManager::Core::GetSitesWithData(uint32 request_id) { base::Bind(&Core::GetSitesWithDataOnIOThread, this, request_id)); } -void PepperFlashSettingsManager::Core::ClearSiteData(uint32 request_id, +void PepperFlashSettingsManager::Core::ClearSiteData(uint32_t request_id, const std::string& site, - uint64 flags, - uint64 max_age) { + uint64_t flags, + uint64_t max_age) { DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( @@ -422,7 +422,7 @@ void PepperFlashSettingsManager::Core::InitializeOnIOThread() { } void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnIOThread( - uint32 request_id) { + uint32_t request_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_NE(STATE_DETACHED, state_); @@ -454,7 +454,7 @@ void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnIOThread( // scheme for generating device IDs. Delete this once we are sure most ChromeOS // devices have been migrated. void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnBlockingPool( - uint32 request_id, + uint32_t request_id, const base::FilePath& profile_path) { // ChromeOS used to store the device ID in a file but this is no longer used. // Wipe that file. @@ -469,7 +469,7 @@ void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnBlockingPool( } void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (!success) { @@ -487,7 +487,7 @@ void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin( } void PepperFlashSettingsManager::Core::GetPermissionSettingsOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_NE(STATE_DETACHED, state_); @@ -519,7 +519,7 @@ void PepperFlashSettingsManager::Core::GetPermissionSettingsOnIOThread( } void PepperFlashSettingsManager::Core::SetDefaultPermissionOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific) { @@ -555,7 +555,7 @@ void PepperFlashSettingsManager::Core::SetDefaultPermissionOnIOThread( } void PepperFlashSettingsManager::Core::SetSitePermissionOnIOThread( - uint32 request_id, + uint32_t request_id, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -588,7 +588,7 @@ void PepperFlashSettingsManager::Core::SetSitePermissionOnIOThread( } void PepperFlashSettingsManager::Core::GetSitesWithDataOnIOThread( - uint32 request_id) { + uint32_t request_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_NE(STATE_DETACHED, state_); @@ -617,10 +617,10 @@ void PepperFlashSettingsManager::Core::GetSitesWithDataOnIOThread( } void PepperFlashSettingsManager::Core::ClearSiteDataOnIOThread( - uint32 request_id, + uint32_t request_id, const std::string& site, - uint64 flags, - uint64 max_age) { + uint64_t flags, + uint64_t max_age) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_NE(STATE_DETACHED, state_); @@ -661,7 +661,7 @@ void PepperFlashSettingsManager::Core::NotifyErrorFromIOThread() { return; state_ = STATE_ERROR; - std::vector<std::pair<uint32, RequestType> > notifications; + std::vector<std::pair<uint32_t, RequestType>> notifications; for (std::vector<PendingRequest>::iterator iter = pending_requests_.begin(); iter != pending_requests_.end(); ++iter) { notifications.push_back(std::make_pair(iter->id, iter->type)); @@ -676,10 +676,9 @@ void PepperFlashSettingsManager::Core::NotifyErrorFromIOThread() { base::Bind(&Core::NotifyError, this, notifications)); } -void -PepperFlashSettingsManager::Core::NotifyDeauthorizeContentLicensesCompleted( - uint32 request_id, - bool success) { +void PepperFlashSettingsManager::Core:: + NotifyDeauthorizeContentLicensesCompleted(uint32_t request_id, + bool success) { DCHECK_CURRENTLY_ON(BrowserThread::UI); if (manager_.get()) { @@ -689,7 +688,7 @@ PepperFlashSettingsManager::Core::NotifyDeauthorizeContentLicensesCompleted( } void PepperFlashSettingsManager::Core::NotifyGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) { @@ -702,7 +701,7 @@ void PepperFlashSettingsManager::Core::NotifyGetPermissionSettingsCompleted( } void PepperFlashSettingsManager::Core::NotifySetDefaultPermissionCompleted( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -713,7 +712,7 @@ void PepperFlashSettingsManager::Core::NotifySetDefaultPermissionCompleted( } void PepperFlashSettingsManager::Core::NotifySetSitePermissionCompleted( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -724,7 +723,7 @@ void PepperFlashSettingsManager::Core::NotifySetSitePermissionCompleted( } void PepperFlashSettingsManager::Core::NotifyGetSitesWithDataCompleted( - uint32 request_id, + uint32_t request_id, const std::vector<std::string>& sites) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -735,7 +734,7 @@ void PepperFlashSettingsManager::Core::NotifyGetSitesWithDataCompleted( } void PepperFlashSettingsManager::Core::NotifyClearSiteDataCompleted( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -744,12 +743,13 @@ void PepperFlashSettingsManager::Core::NotifyClearSiteDataCompleted( } void PepperFlashSettingsManager::Core::NotifyError( - const std::vector<std::pair<uint32, RequestType> >& notifications) { + const std::vector<std::pair<uint32_t, RequestType>>& notifications) { DCHECK_CURRENTLY_ON(BrowserThread::UI); scoped_refptr<Core> protector(this); - for (std::vector<std::pair<uint32, RequestType> >::const_iterator iter = - notifications.begin(); iter != notifications.end(); ++iter) { + for (std::vector<std::pair<uint32_t, RequestType>>::const_iterator iter = + notifications.begin(); + iter != notifications.end(); ++iter) { // Check |manager_| for each iteration in case it is destroyed in one of // the callbacks. if (!manager_.get()) @@ -790,7 +790,7 @@ void PepperFlashSettingsManager::Core::NotifyError( } void PepperFlashSettingsManager::Core::OnDeauthorizeContentLicensesResult( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (state_ == STATE_DETACHED) @@ -798,7 +798,7 @@ void PepperFlashSettingsManager::Core::OnDeauthorizeContentLicensesResult( DLOG_IF(ERROR, !success) << "DeauthorizeContentLicenses returned error"; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -813,7 +813,7 @@ void PepperFlashSettingsManager::Core::OnDeauthorizeContentLicensesResult( } void PepperFlashSettingsManager::Core::OnGetPermissionSettingsResult( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) { @@ -823,7 +823,7 @@ void PepperFlashSettingsManager::Core::OnGetPermissionSettingsResult( DLOG_IF(ERROR, !success) << "GetPermissionSettings returned error"; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -838,7 +838,7 @@ void PepperFlashSettingsManager::Core::OnGetPermissionSettingsResult( } void PepperFlashSettingsManager::Core::OnSetDefaultPermissionResult( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (state_ == STATE_DETACHED) @@ -846,7 +846,7 @@ void PepperFlashSettingsManager::Core::OnSetDefaultPermissionResult( DLOG_IF(ERROR, !success) << "SetDefaultPermission returned error"; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -861,7 +861,7 @@ void PepperFlashSettingsManager::Core::OnSetDefaultPermissionResult( } void PepperFlashSettingsManager::Core::OnSetSitePermissionResult( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (state_ == STATE_DETACHED) @@ -869,7 +869,7 @@ void PepperFlashSettingsManager::Core::OnSetSitePermissionResult( DLOG_IF(ERROR, !success) << "SetSitePermission returned error"; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -884,13 +884,13 @@ void PepperFlashSettingsManager::Core::OnSetSitePermissionResult( } void PepperFlashSettingsManager::Core::OnGetSitesWithDataResult( - uint32 request_id, + uint32_t request_id, const std::vector<std::string>& sites) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (state_ == STATE_DETACHED) return; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -905,7 +905,7 @@ void PepperFlashSettingsManager::Core::OnGetSitesWithDataResult( } void PepperFlashSettingsManager::Core::OnClearSiteDataResult( - uint32 request_id, + uint32_t request_id, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (state_ == STATE_DETACHED) @@ -913,7 +913,7 @@ void PepperFlashSettingsManager::Core::OnClearSiteDataResult( DLOG_IF(ERROR, !success) << "ClearSiteData returned error"; - std::map<uint32, RequestType>::iterator iter = + std::map<uint32_t, RequestType>::iterator iter = pending_responses_.find(request_id); if (iter == pending_responses_.end()) return; @@ -975,7 +975,7 @@ void PepperFlashSettingsManager::RegisterProfilePrefs( registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled, true); } -uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses( +uint32_t PepperFlashSettingsManager::DeauthorizeContentLicenses( PrefService* prefs) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -985,66 +985,66 @@ uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses( prefs->ClearPref(prefs::kDRMSalt); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->DeauthorizeContentLicenses(id); return id; } -uint32 PepperFlashSettingsManager::GetPermissionSettings( +uint32_t PepperFlashSettingsManager::GetPermissionSettings( PP_Flash_BrowserOperations_SettingType setting_type) { DCHECK_CURRENTLY_ON(BrowserThread::UI); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->GetPermissionSettings(id, setting_type); return id; } -uint32 PepperFlashSettingsManager::SetDefaultPermission( +uint32_t PepperFlashSettingsManager::SetDefaultPermission( PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific) { DCHECK_CURRENTLY_ON(BrowserThread::UI); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->SetDefaultPermission(id, setting_type, permission, clear_site_specific); return id; } -uint32 PepperFlashSettingsManager::SetSitePermission( +uint32_t PepperFlashSettingsManager::SetSitePermission( PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites) { DCHECK_CURRENTLY_ON(BrowserThread::UI); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->SetSitePermission(id, setting_type, sites); return id; } -uint32 PepperFlashSettingsManager::GetSitesWithData() { +uint32_t PepperFlashSettingsManager::GetSitesWithData() { DCHECK_CURRENTLY_ON(BrowserThread::UI); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->GetSitesWithData(id); return id; } -uint32 PepperFlashSettingsManager::ClearSiteData(const std::string& site, - uint64 flags, - uint64 max_age) { +uint32_t PepperFlashSettingsManager::ClearSiteData(const std::string& site, + uint64_t flags, + uint64_t max_age) { DCHECK_CURRENTLY_ON(BrowserThread::UI); EnsureCoreExists(); - uint32 id = GetNextRequestId(); + uint32_t id = GetNextRequestId(); core_->ClearSiteData(id, site, flags, max_age); return id; } -uint32 PepperFlashSettingsManager::GetNextRequestId() { +uint32_t PepperFlashSettingsManager::GetNextRequestId() { return next_request_id_++; } diff --git a/chrome/browser/pepper_flash_settings_manager.h b/chrome/browser/pepper_flash_settings_manager.h index ee92fc5..5eca3e4 100644 --- a/chrome/browser/pepper_flash_settings_manager.h +++ b/chrome/browser/pepper_flash_settings_manager.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_PEPPER_FLASH_SETTINGS_MANAGER_H_ #define CHROME_BROWSER_PEPPER_FLASH_SETTINGS_MANAGER_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "ppapi/c/private/ppp_flash_browser_operations.h" @@ -31,25 +33,25 @@ class PepperFlashSettingsManager { public: virtual ~Client() {} - virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id, + virtual void OnDeauthorizeContentLicensesCompleted(uint32_t request_id, bool success) {} virtual void OnGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) {} - virtual void OnSetDefaultPermissionCompleted(uint32 request_id, + virtual void OnSetDefaultPermissionCompleted(uint32_t request_id, bool success) {} - virtual void OnSetSitePermissionCompleted(uint32 request_id, + virtual void OnSetSitePermissionCompleted(uint32_t request_id, bool success) {} virtual void OnGetSitesWithDataCompleted( - uint32 request_id, + uint32_t request_id, const std::vector<std::string>& sites) {} - virtual void OnClearSiteDataCompleted(uint32 request_id, bool success) {} + virtual void OnClearSiteDataCompleted(uint32_t request_id, bool success) {} }; // |client| must outlive this object. It is guaranteed that |client| won't @@ -70,18 +72,18 @@ class PepperFlashSettingsManager { // operation is completed. // The return value is the same as the request ID passed into // Client::OnDeauthorizeContentLicensesCompleted(). - uint32 DeauthorizeContentLicenses(PrefService* prefs); + uint32_t DeauthorizeContentLicenses(PrefService* prefs); // Gets permission settings. // Client::OnGetPermissionSettingsCompleted() will be called when the // operation is completed. - uint32 GetPermissionSettings( + uint32_t GetPermissionSettings( PP_Flash_BrowserOperations_SettingType setting_type); // Sets default permission. // Client::OnSetDefaultPermissionCompleted() will be called when the // operation is completed. - uint32 SetDefaultPermission( + uint32_t SetDefaultPermission( PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific); @@ -89,18 +91,21 @@ class PepperFlashSettingsManager { // Sets site-specific permission. // Client::OnSetSitePermissionCompleted() will be called when the operation // is completed. - uint32 SetSitePermission(PP_Flash_BrowserOperations_SettingType setting_type, - const ppapi::FlashSiteSettings& sites); + uint32_t SetSitePermission( + PP_Flash_BrowserOperations_SettingType setting_type, + const ppapi::FlashSiteSettings& sites); // Gets a list of sites that have stored data. // Client::OnGetSitesWithDataCompleted() will be called when the operation is // completed. - uint32 GetSitesWithData(); + uint32_t GetSitesWithData(); // Clears data for a certain site. // Client::OnClearSiteDataompleted() will be called when the operation is // completed. - uint32 ClearSiteData(const std::string& site, uint64 flags, uint64 max_age); + uint32_t ClearSiteData(const std::string& site, + uint64_t flags, + uint64_t max_age); private: // Core does most of the work. It is ref-counted so that its lifespan can be @@ -111,7 +116,7 @@ class PepperFlashSettingsManager { // another one to handle new requests. class Core; - uint32 GetNextRequestId(); + uint32_t GetNextRequestId(); void EnsureCoreExists(); @@ -126,7 +131,7 @@ class PepperFlashSettingsManager { scoped_refptr<Core> core_; - uint32 next_request_id_; + uint32_t next_request_id_; base::WeakPtrFactory<PepperFlashSettingsManager> weak_ptr_factory_; diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index dda007d..0aab66a 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -4,6 +4,8 @@ #include "chrome/browser/performance_monitor/performance_monitor.h" +#include <stddef.h> + #include "base/memory/singleton.h" #include "base/process/process_iterator.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index d06af4d..73a9064 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -8,6 +8,7 @@ #include <map> #include <vector> +#include "base/macros.h" #include "base/process/process_handle.h" #include "base/timer/timer.h" #include "chrome/browser/performance_monitor/process_metrics_history.h" diff --git a/chrome/browser/performance_monitor/process_metrics_history.cc b/chrome/browser/performance_monitor/process_metrics_history.cc index 824444b..8face97 100644 --- a/chrome/browser/performance_monitor/process_metrics_history.cc +++ b/chrome/browser/performance_monitor/process_metrics_history.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/process/process_metrics.h" +#include "build/build_config.h" #include "content/public/common/process_type.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/performance_monitor/process_metrics_history.h b/chrome/browser/performance_monitor/process_metrics_history.h index 21f9209..aa2c9d1 100644 --- a/chrome/browser/performance_monitor/process_metrics_history.h +++ b/chrome/browser/performance_monitor/process_metrics_history.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_PROCESS_METRICS_HISTORY_H_ #define CHROME_BROWSER_PERFORMANCE_MONITOR_PROCESS_METRICS_HISTORY_H_ +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/process/process_handle.h" #include "content/public/browser/background_tracing_manager.h" diff --git a/chrome/browser/permissions/permission_bubble_request_impl.cc b/chrome/browser/permissions/permission_bubble_request_impl.cc index 41a103e..e4ffba1 100644 --- a/chrome/browser/permissions/permission_bubble_request_impl.cc +++ b/chrome/browser/permissions/permission_bubble_request_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/permissions/permission_bubble_request_impl.h" +#include "build/build_config.h" #include "chrome/browser/permissions/permission_context_base.h" #include "chrome/browser/permissions/permission_uma_util.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/permissions/permission_bubble_request_impl.h b/chrome/browser/permissions/permission_bubble_request_impl.h index 95e8252..ae9e016 100644 --- a/chrome/browser/permissions/permission_bubble_request_impl.h +++ b/chrome/browser/permissions/permission_bubble_request_impl.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/permissions/permission_request_id.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "components/content_settings/core/common/content_settings.h" diff --git a/chrome/browser/permissions/permission_context.cc b/chrome/browser/permissions/permission_context.cc index 2a4f806..cf94b07 100644 --- a/chrome/browser/permissions/permission_context.cc +++ b/chrome/browser/permissions/permission_context.cc @@ -4,6 +4,7 @@ #include "chrome/browser/permissions/permission_context.h" +#include "build/build_config.h" #include "chrome/browser/geolocation/geolocation_permission_context.h" #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" #include "chrome/browser/media/media_stream_camera_permission_context_factory.h" diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc index dc5b8bd3..f555d1e 100644 --- a/chrome/browser/permissions/permission_context_base.cc +++ b/chrome/browser/permissions/permission_context_base.cc @@ -4,9 +4,12 @@ #include "chrome/browser/permissions/permission_context_base.h" +#include <stddef.h> + #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_request_id.h" #include "chrome/browser/permissions/permission_uma_util.h" diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h index b135e25..8a0ac63 100644 --- a/chrome/browser/permissions/permission_context_base.h +++ b/chrome/browser/permissions/permission_context_base.h @@ -9,6 +9,7 @@ #include "base/containers/scoped_ptr_hash_map.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc index 02d984b..19d7135 100644 --- a/chrome/browser/permissions/permission_context_base_unittest.cc +++ b/chrome/browser/permissions/permission_context_base_unittest.cc @@ -6,8 +6,10 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/test/mock_entropy_provider.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/permissions/permission_queue_controller.h" diff --git a/chrome/browser/permissions/permission_infobar_delegate.h b/chrome/browser/permissions/permission_infobar_delegate.h index 6413f6c..d39d3c7 100644 --- a/chrome/browser/permissions/permission_infobar_delegate.h +++ b/chrome/browser/permissions/permission_infobar_delegate.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_ +#include "base/macros.h" #include "chrome/browser/infobars/infobar_service.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/confirm_infobar_delegate.h" diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc index d83e12eb..44d97af 100644 --- a/chrome/browser/permissions/permission_manager.cc +++ b/chrome/browser/permissions/permission_manager.cc @@ -4,7 +4,10 @@ #include "chrome/browser/permissions/permission_manager.h" +#include <stddef.h> + #include "base/callback.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_context.h" #include "chrome/browser/permissions/permission_context_base.h" diff --git a/chrome/browser/permissions/permission_manager_factory.h b/chrome/browser/permissions/permission_manager_factory.h index a6d2c28..be49905 100644 --- a/chrome/browser/permissions/permission_manager_factory.h +++ b/chrome/browser/permissions/permission_manager_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_FACTORY_H_ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_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/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc index ab5561f..8144f4f 100644 --- a/chrome/browser/permissions/permission_manager_unittest.cc +++ b/chrome/browser/permissions/permission_manager_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/permissions/permission_manager.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_manager_factory.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/permissions/permission_queue_controller.h b/chrome/browser/permissions/permission_queue_controller.h index 3e8b7fe..ef8cd62 100644 --- a/chrome/browser/permissions/permission_queue_controller.h +++ b/chrome/browser/permissions/permission_queue_controller.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_QUEUE_CONTROLLER_H_ #include "base/bind.h" +#include "base/macros.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/permissions/permission_queue_controller_unittest.cc b/chrome/browser/permissions/permission_queue_controller_unittest.cc index c6b94fe..8f1b254 100644 --- a/chrome/browser/permissions/permission_queue_controller_unittest.cc +++ b/chrome/browser/permissions/permission_queue_controller_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/permissions/permission_queue_controller.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/permissions/permission_uma_util.h b/chrome/browser/permissions/permission_uma_util.h index f7f886f..254f3c1 100644 --- a/chrome/browser/permissions/permission_uma_util.h +++ b/chrome/browser/permissions/permission_uma_util.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_ #include "base/logging.h" +#include "base/macros.h" class GURL; class Profile; diff --git a/chrome/browser/permissions/permission_update_infobar_delegate_android.h b/chrome/browser/permissions/permission_update_infobar_delegate_android.h index 34db3c7..4aeb168 100644 --- a/chrome/browser/permissions/permission_update_infobar_delegate_android.h +++ b/chrome/browser/permissions/permission_update_infobar_delegate_android.h @@ -11,6 +11,7 @@ #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/confirm_infobar_delegate.h" diff --git a/chrome/browser/platform_util.h b/chrome/browser/platform_util.h index 7a9494d..81cb4b8 100644 --- a/chrome/browser/platform_util.h +++ b/chrome/browser/platform_util.h @@ -9,6 +9,7 @@ #include "base/callback_forward.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "chrome/common/features.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/platform_util_unittest.cc b/chrome/browser/platform_util_unittest.cc index caaf200..1fd8eb8 100644 --- a/chrome/browser/platform_util_unittest.cc +++ b/chrome/browser/platform_util_unittest.cc @@ -8,8 +8,10 @@ #include "base/callback.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/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/platform_util_internal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 4e2d9f2..967ad9f 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -8,12 +8,14 @@ #include <dwmapi.h> #include <shellapi.h> #include <shlobj.h> +#include <stddef.h> #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h index 5893c8e..815eafb 100644 --- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h +++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PLUGINS_CHROME_CONTENT_BROWSER_CLIENT_PLUGINS_PART_H_ #define CHROME_BROWSER_PLUGINS_CHROME_CONTENT_BROWSER_CLIENT_PLUGINS_PART_H_ +#include "base/macros.h" #include "chrome/browser/chrome_content_browser_client_parts.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/common/socket_permission_request.h" diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc index 3407001..6fc88d8 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/plugins/plugin_finder.h" diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index ee30a6c..2fa5a49 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -14,6 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/plugin_service_filter.h" diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 6c68179..b2fd197 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -4,6 +4,8 @@ #include "chrome/browser/plugins/plugin_finder.h" +#include <stddef.h> + #include "base/bind.h" #include "base/json/json_reader.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/plugins/plugin_finder.h b/chrome/browser/plugins/plugin_finder.h index 6a12911..5704863 100644 --- a/chrome/browser/plugins/plugin_finder.h +++ b/chrome/browser/plugins/plugin_finder.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/strings/string16.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 8c33164..3d2325b 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -4,12 +4,15 @@ #include "chrome/browser/plugins/plugin_info_message_filter.h" +#include <stddef.h> + #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index 36eeaf5..953ae75 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc index 0cbb688..d7d5c6c 100644 --- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc +++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc @@ -10,6 +10,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc index 92b4640..80cb2eb 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h index 754036c..d6a9488 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.h +++ b/chrome/browser/plugins/plugin_infobar_delegates.h @@ -6,6 +6,8 @@ #define CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_ #include "base/callback.h" +#include "base/macros.h" +#include "build/build_config.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "url/gurl.h" diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h index 70ced4e..1df7570 100644 --- a/chrome/browser/plugins/plugin_installer.h +++ b/chrome/browser/plugins/plugin_installer.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/strings/string16.h" #include "base/version.h" diff --git a/chrome/browser/plugins/plugin_metadata.cc b/chrome/browser/plugins/plugin_metadata.cc index 87b4418..b99f3ee 100644 --- a/chrome/browser/plugins/plugin_metadata.cc +++ b/chrome/browser/plugins/plugin_metadata.cc @@ -4,6 +4,8 @@ #include "chrome/browser/plugins/plugin_metadata.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/chrome/browser/plugins/plugin_metadata.h b/chrome/browser/plugins/plugin_metadata.h index 99ed7d3..679e8c6 100644 --- a/chrome/browser/plugins/plugin_metadata.h +++ b/chrome/browser/plugins/plugin_metadata.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/version.h" diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 7210af3..ed901b1 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -10,6 +10,7 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h index 240bc7c..6cfab2c 100644 --- a/chrome/browser/plugins/plugin_observer.h +++ b/chrome/browser/plugins/plugin_observer.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc index 51dbe4e..5169aaf 100644 --- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc +++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc @@ -2,12 +2,15 @@ // 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/command_line.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index a754c32..11b74a0 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc @@ -4,6 +4,8 @@ #include "chrome/browser/plugins/plugin_prefs.h" +#include <stddef.h> + #include <string> #include "base/bind.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index d95db2d..eab192e 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -9,8 +9,8 @@ #include <set> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc index 49c76c0..89b3a97 100644 --- a/chrome/browser/plugins/plugin_prefs_unittest.cc +++ b/chrome/browser/plugins/plugin_prefs_unittest.cc @@ -9,6 +9,7 @@ #include "base/path_service.h" #include "base/run_loop.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 "content/public/browser/plugin_service.h" diff --git a/chrome/browser/plugins/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h index ee08c2e..e9e2baa 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.h +++ b/chrome/browser/plugins/plugin_status_pref_setter.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/prefs/pref_member.h" diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc index 4dee543..5426c66 100644 --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/plugins/plugins_resource_service.h b/chrome/browser/plugins/plugins_resource_service.h index bed0d9d..29452d5 100644 --- a/chrome/browser/plugins/plugins_resource_service.h +++ b/chrome/browser/plugins/plugins_resource_service.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PLUGINS_PLUGINS_RESOURCE_SERVICE_H_ #define CHROME_BROWSER_PLUGINS_PLUGINS_RESOURCE_SERVICE_H_ +#include "base/macros.h" #include "components/web_resource/web_resource_service.h" class PrefService; diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc index 5f19b2a..3f2d438 100644 --- a/chrome/browser/policy/chrome_browser_policy_connector.cc +++ b/chrome/browser/policy/chrome_browser_policy_connector.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/policy/configuration_policy_handler_list_factory.h" #include "chrome/browser/policy/device_management_service_configuration.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/policy/chrome_browser_policy_connector.h b/chrome/browser/policy/chrome_browser_policy_connector.h index ba24431..d48a159 100644 --- a/chrome/browser/policy/chrome_browser_policy_connector.h +++ b/chrome/browser/policy/chrome_browser_policy_connector.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_ #define CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/policy/core/browser/browser_policy_connector.h" @@ -25,7 +27,7 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector { public: // Service initialization delay time in millisecond on startup. (So that // displaying Chrome's GUI does not get delayed.) - static const int64 kServiceInitializationStartupDelay = 5000; + static const int64_t kServiceInitializationStartupDelay = 5000; // Builds an uninitialized ChromeBrowserPolicyConnector, suitable for testing. // Init() should be called to create and start the policy machinery. diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 5f454cc..b06aeb7 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/invalidation/fake_invalidation_service.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc index 0947a24..97bf3e0 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc @@ -35,7 +35,7 @@ CloudPolicyInvalidator::CloudPolicyInvalidator( CloudPolicyCore* core, const scoped_refptr<base::SequencedTaskRunner>& task_runner, scoped_ptr<base::Clock> clock, - int64 highest_handled_invalidation_version) + int64_t highest_handled_invalidation_version) : state_(UNINITIALIZED), type_(type), core_(core), @@ -167,7 +167,7 @@ void CloudPolicyInvalidator::OnStoreLoaded(CloudPolicyStore* store) { METRIC_POLICY_REFRESH_SIZE); } - const int64 store_invalidation_version = store->invalidation_version(); + const int64_t store_invalidation_version = store->invalidation_version(); // If the policy was invalid and the version stored matches the latest // invalidation version, acknowledge the latest invalidation. @@ -212,7 +212,7 @@ void CloudPolicyInvalidator::HandleInvalidation( // numbers based on the number of such invalidations received. This // ensures that the version numbers do not collide with "real" versions // (which are positive) or previous invalidations with unknown version. - int64 version; + int64_t version; std::string payload; if (invalidation.is_unknown_version()) { version = -(++unknown_version_invalidation_count_); @@ -380,7 +380,7 @@ bool CloudPolicyInvalidator::IsPolicyChanged( const enterprise_management::PolicyData* policy) { // Determine if the policy changed by comparing its hash value to the // previous policy's hash value. - uint32 new_hash_value = 0; + uint32_t new_hash_value = 0; if (policy && policy->has_policy_value()) new_hash_value = base::Hash(policy->policy_value()); bool changed = new_hash_value != policy_hash_value_; @@ -388,7 +388,7 @@ bool CloudPolicyInvalidator::IsPolicyChanged( return changed; } -bool CloudPolicyInvalidator::IsInvalidationExpired(int64 version) { +bool CloudPolicyInvalidator::IsInvalidationExpired(int64_t version) { base::Time last_fetch_time = base::Time::UnixEpoch() + base::TimeDelta::FromMilliseconds(core_->store()->policy()->timestamp()); diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h index fa89d12..8932c4e 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h @@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_ #define CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -72,7 +74,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, CloudPolicyCore* core, const scoped_refptr<base::SequencedTaskRunner>& task_runner, scoped_ptr<base::Clock> clock, - int64 highest_handled_invalidation_version); + int64_t highest_handled_invalidation_version); ~CloudPolicyInvalidator() override; // Initializes the invalidator. No invalidations will be generated before this @@ -91,7 +93,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, } // The highest invalidation version that was handled already. - int64 highest_handled_invalidation_version() const { + int64_t highest_handled_invalidation_version() const { return highest_handled_invalidation_version_; } @@ -150,7 +152,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, // Determine if an invalidation has expired. // |version| is the version of the invalidation, or zero for unknown. - bool IsInvalidationExpired(int64 version); + bool IsInvalidationExpired(int64_t version); // Get the kMetricPolicyRefresh histogram metric which should be incremented // when a policy is stored. @@ -212,7 +214,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, // The version of the latest invalidation received. This is compared to // the invalidation version of policy stored to determine when the // invalidated policy is up-to-date. - int64 invalidation_version_; + int64_t invalidation_version_; // The number of invalidations with unknown version received. Since such // invalidations do not provide a version number, this count is used to set @@ -220,7 +222,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, int unknown_version_invalidation_count_; // The highest invalidation version that was handled already. - int64 highest_handled_invalidation_version_; + int64_t highest_handled_invalidation_version_; // The most up to date invalidation. scoped_ptr<syncer::Invalidation> invalidation_; @@ -231,7 +233,7 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, // The hash value of the current policy. This is used to determine if a new // policy is different from the current one. - uint32 policy_hash_value_; + uint32_t policy_hash_value_; // A thread checker to make sure that callbacks are invoked on the correct // thread. diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index d741b97..a83962a 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc @@ -2,10 +2,12 @@ // 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/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -17,6 +19,7 @@ #include "base/test/test_simple_task_runner.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/invalidation/fake_invalidation_service.h" #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h" #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator.h" @@ -56,7 +59,7 @@ class CloudPolicyInvalidatorTest : public testing::Test { // that was handled already before this invalidator was created. void StartInvalidator(bool initialize, bool start_refresh_scheduler, - int64 highest_handled_invalidation_version); + int64_t highest_handled_invalidation_version); void StartInvalidator() { StartInvalidator(true, /* initialize */ true, /* start_refresh_scheduler */ @@ -89,21 +92,19 @@ class CloudPolicyInvalidatorTest : public testing::Test { // |policy_changed| determines whether a policy value different from the // current value will be stored. // |time| determines the timestamp the store will report. - void StorePolicy( - PolicyObject object, - int64 invalidation_version, - bool policy_changed, - const base::Time& time); - void StorePolicy( - PolicyObject object, - int64 invalidation_version, - bool policy_changed) { + void StorePolicy(PolicyObject object, + int64_t invalidation_version, + bool policy_changed, + const base::Time& time); + void StorePolicy(PolicyObject object, + int64_t invalidation_version, + bool policy_changed) { StorePolicy(object, invalidation_version, policy_changed, Now() - base::TimeDelta::FromMinutes(5)); } - void StorePolicy(PolicyObject object, int64 invalidation_version) { + void StorePolicy(PolicyObject object, int64_t invalidation_version) { StorePolicy(object, invalidation_version, false); } void StorePolicy(PolicyObject object) { @@ -117,17 +118,16 @@ class CloudPolicyInvalidatorTest : public testing::Test { void EnableInvalidationService(); // Causes the invalidation service to fire an invalidation. - syncer::Invalidation FireInvalidation( - PolicyObject object, - int64 version, - const std::string& payload); + syncer::Invalidation FireInvalidation(PolicyObject object, + int64_t version, + const std::string& payload); // Causes the invalidation service to fire an invalidation with unknown // version. syncer::Invalidation FireUnknownVersionInvalidation(PolicyObject object); // Checks the expected value of the currently set invalidation info. - bool CheckInvalidationInfo(int64 version, const std::string& payload); + bool CheckInvalidationInfo(int64_t version, const std::string& payload); // Checks that the policy was not refreshed due to an invalidation. bool CheckPolicyNotRefreshed(); @@ -154,7 +154,7 @@ class CloudPolicyInvalidatorTest : public testing::Test { // Returns the highest invalidation version that was handled already according // to the |invalidator_|. - int64 GetHighestHandledInvalidationVersion() const; + int64_t GetHighestHandledInvalidationVersion() const; // Advance the test clock. void AdvanceClock(base::TimeDelta delta); @@ -164,10 +164,10 @@ class CloudPolicyInvalidatorTest : public testing::Test { // Translate a version number into an appropriate invalidation version (which // is based on the current time). - int64 V(int version); + int64_t V(int version); // Get an invalidation version for the given time. - int64 GetVersion(base::Time time); + int64_t GetVersion(base::Time time); // Get the policy type that the |invalidator_| is responsible for. virtual em::DeviceRegisterRequest::Type GetPolicyType() const; @@ -235,7 +235,7 @@ void CloudPolicyInvalidatorTest::TearDown() { void CloudPolicyInvalidatorTest::StartInvalidator( bool initialize, bool start_refresh_scheduler, - int64 highest_handled_invalidation_version) { + int64_t highest_handled_invalidation_version) { invalidator_.reset(new CloudPolicyInvalidator( GetPolicyType(), &core_, @@ -277,11 +277,10 @@ void CloudPolicyInvalidatorTest::DisconnectCore() { core_.Disconnect(); } -void CloudPolicyInvalidatorTest::StorePolicy( - PolicyObject object, - int64 invalidation_version, - bool policy_changed, - const base::Time& time) { +void CloudPolicyInvalidatorTest::StorePolicy(PolicyObject object, + int64_t invalidation_version, + bool policy_changed, + const base::Time& time) { em::PolicyData* data = new em::PolicyData(); if (object != POLICY_OBJECT_NONE) { data->set_invalidation_source(GetPolicyObjectId(object).source()); @@ -318,7 +317,7 @@ void CloudPolicyInvalidatorTest::EnableInvalidationService() { syncer::Invalidation CloudPolicyInvalidatorTest::FireInvalidation( PolicyObject object, - int64 version, + int64_t version, const std::string& payload) { syncer::Invalidation invalidation = syncer::Invalidation::Init( GetPolicyObjectId(object), @@ -337,7 +336,7 @@ syncer::Invalidation CloudPolicyInvalidatorTest::FireUnknownVersionInvalidation( } bool CloudPolicyInvalidatorTest::CheckInvalidationInfo( - int64 version, + int64_t version, const std::string& payload) { MockCloudPolicyClient* client = static_cast<MockCloudPolicyClient*>(core_.client()); @@ -383,7 +382,8 @@ bool CloudPolicyInvalidatorTest::IsInvalidatorRegistered() { .GetRegisteredIds(invalidator_.get()).empty(); } -int64 CloudPolicyInvalidatorTest::GetHighestHandledInvalidationVersion() const { +int64_t CloudPolicyInvalidatorTest::GetHighestHandledInvalidationVersion() + const { return invalidator_->highest_handled_invalidation_version(); } @@ -395,11 +395,11 @@ base::Time CloudPolicyInvalidatorTest::Now() { return clock_->Now(); } -int64 CloudPolicyInvalidatorTest::V(int version) { +int64_t CloudPolicyInvalidatorTest::V(int version) { return GetVersion(Now()) + version; } -int64 CloudPolicyInvalidatorTest::GetVersion(base::Time time) { +int64_t CloudPolicyInvalidatorTest::GetVersion(base::Time time) { return (time - base::Time::UnixEpoch()).InMicroseconds(); } diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index 9c63d1a..26bb250 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/cloud/test_request_interceptor.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index e7dc335..24558f5 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/policy/profile_policy_connector.h" diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc index cfe06fd..cee468e 100644 --- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc +++ b/chrome/browser/policy/cloud/device_management_service_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/memory/scoped_ptr.h" @@ -39,7 +41,7 @@ namespace { // Parses the DeviceManagementRequest in |request_data| and writes a serialized // DeviceManagementResponse to |response_data|. void ConstructResponse(const char* request_data, - uint64 request_data_length, + uint64_t request_data_length, std::string* response_data) { em::DeviceManagementRequest request; ASSERT_TRUE(request.ParseFromArray(request_data, request_data_length)); diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.cc b/chrome/browser/policy/cloud/policy_header_service_factory.cc index 86cbb37..759faff 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.cc +++ b/chrome/browser/policy/cloud/policy_header_service_factory.cc @@ -5,6 +5,7 @@ #include "chrome/browser/policy/cloud/policy_header_service_factory.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.h b/chrome/browser/policy/cloud/policy_header_service_factory.h index f81ec93..22bee05 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.h +++ b/chrome/browser/policy/cloud/policy_header_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_POLICY_HEADER_SERVICE_FACTORY_H_ #define CHROME_BROWSER_POLICY_CLOUD_POLICY_HEADER_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/policy/cloud/remote_commands_invalidator_unittest.cc b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc index e1da6ef..b18930b 100644 --- a/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/policy/cloud/remote_commands_invalidator.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "chrome/browser/invalidation/fake_invalidation_service.h" diff --git a/chrome/browser/policy/cloud/test_request_interceptor.cc b/chrome/browser/policy/cloud/test_request_interceptor.cc index 458fc06..d1da15a 100644 --- a/chrome/browser/policy/cloud/test_request_interceptor.cc +++ b/chrome/browser/policy/cloud/test_request_interceptor.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/sequenced_task_runner.h" diff --git a/chrome/browser/policy/cloud/test_request_interceptor.h b/chrome/browser/policy/cloud/test_request_interceptor.h index 858af64..e3539e2 100644 --- a/chrome/browser/policy/cloud/test_request_interceptor.h +++ b/chrome/browser/policy/cloud/test_request_interceptor.h @@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_TEST_REQUEST_INTERCEPTOR_H_ #define CHROME_BROWSER_POLICY_CLOUD_TEST_REQUEST_INTERCEPTOR_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc index 76953a4..95784b642 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" #include "base/time/default_clock.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "components/invalidation/impl/profile_invalidation_provider.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h index 82e19ed..eb1de93 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_INVALIDATOR_H_ #define CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_INVALIDATOR_H_ +#include "base/macros.h" #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc index 9ef12e4..93c608a 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc @@ -4,6 +4,7 @@ #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" +#include "build/build_config.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h index bbb9004..7ea3d27 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_INVALIDATOR_FACTORY_H_ #define CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_INVALIDATOR_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/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc index e2bec6f..867e06b 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc @@ -6,6 +6,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/policy/schema_registry_service.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h index 3ae0414..0f85de9 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h @@ -7,7 +7,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_base_factory.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.h b/chrome/browser/policy/cloud/user_policy_signin_service.h index 6c0b0e3..fea47f9 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/policy/cloud/user_policy_signin_service_base.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc index df3abca..ce937c2 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc @@ -8,6 +8,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.h b/chrome/browser/policy/cloud/user_policy_signin_service_base.h index 2248d9c..9e0cf6c2 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_base.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.h @@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.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/policy/cloud/user_policy_signin_service_factory.cc b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc index 40e831e..70c580b 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc @@ -6,6 +6,7 @@ #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h index 4801b49..dcef00d 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CLOUD_USER_POLICY_SIGNIN_SERVICE_FACTORY_H_ #define CHROME_BROWSER_POLICY_CLOUD_USER_POLICY_SIGNIN_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/policy/cloud/user_policy_signin_service_mobile.cc b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc index ae35fd9..dec573e 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc @@ -11,6 +11,7 @@ #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h index 56d6958..5828540 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h @@ -8,11 +8,12 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/policy/cloud/user_policy_signin_service_base.h" class ProfileOAuth2TokenService; diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc index 3295fc7..54628c2 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc @@ -8,6 +8,7 @@ #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 17c807e..a7d1666 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -4,11 +4,14 @@ #include "chrome/browser/policy/configuration_policy_handler_list_factory.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_value_map.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/policy/managed_bookmarks_policy_handler.h" #include "chrome/browser/profiles/incognito_mode_policy_handler.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/policy/device_management_service_configuration.cc b/chrome/browser/policy/device_management_service_configuration.cc index a47805e..1b8200b 100644 --- a/chrome/browser/policy/device_management_service_configuration.cc +++ b/chrome/browser/policy/device_management_service_configuration.cc @@ -4,10 +4,12 @@ #include "chrome/browser/policy/device_management_service_configuration.h" -#include "base/basictypes.h" +#include <stdint.h> + #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" +#include "build/build_config.h" #include "components/policy/core/browser/browser_policy_connector.h" #include "components/version_info/version_info.h" @@ -55,9 +57,9 @@ std::string DeviceManagementServiceConfiguration::GetPlatformParameter() { std::string os_version("-"); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) - int32 os_major_version = 0; - int32 os_minor_version = 0; - int32 os_bugfix_version = 0; + int32_t os_major_version = 0; + int32_t os_minor_version = 0; + int32_t os_bugfix_version = 0; base::SysInfo::OperatingSystemVersionNumbers(&os_major_version, &os_minor_version, &os_bugfix_version); diff --git a/chrome/browser/policy/file_selection_dialogs_policy_handler.h b/chrome/browser/policy/file_selection_dialogs_policy_handler.h index b5b95d9..dbe333b 100644 --- a/chrome/browser/policy/file_selection_dialogs_policy_handler.h +++ b/chrome/browser/policy/file_selection_dialogs_policy_handler.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_POLICY_FILE_SELECTION_DIALOGS_POLICY_HANDLER_H_ #define CHROME_BROWSER_POLICY_FILE_SELECTION_DIALOGS_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" namespace policy { diff --git a/chrome/browser/policy/javascript_policy_handler.h b/chrome/browser/policy/javascript_policy_handler.h index e7ce805..8b1c6c0 100644 --- a/chrome/browser/policy/javascript_policy_handler.h +++ b/chrome/browser/policy/javascript_policy_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_JAVASCRIPT_POLICY_HANDLER_H_ #define CHROME_BROWSER_POLICY_JAVASCRIPT_POLICY_HANDLER_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" class PrefValueMap; diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler.h b/chrome/browser/policy/managed_bookmarks_policy_handler.h index bbe09cb..fc2b001 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler.h +++ b/chrome/browser/policy/managed_bookmarks_policy_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_MANAGED_BOOKMARKS_POLICY_HANDLER_H_ #define CHROME_BROWSER_POLICY_MANAGED_BOOKMARKS_POLICY_HANDLER_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" namespace base { diff --git a/chrome/browser/policy/network_prediction_policy_handler.h b/chrome/browser/policy/network_prediction_policy_handler.h index 9a8d3e4..af6671f 100644 --- a/chrome/browser/policy/network_prediction_policy_handler.h +++ b/chrome/browser/policy/network_prediction_policy_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_NETWORK_PREDICTION_POLICY_HANDLER_H_ #define CHROME_BROWSER_POLICY_NETWORK_PREDICTION_POLICY_HANDLER_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" class PrefValueMap; diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 03ad285..f6c1a1b 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_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 <string> #include <vector> @@ -15,6 +18,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/memory/scoped_ptr.h" #include "base/path_service.h" @@ -29,6 +33,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/browser_process.h" @@ -193,7 +198,6 @@ #endif #if !defined(OS_MACOSX) -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/ui/extensions/app_launch_params.h" #include "chrome/browser/ui/extensions/application_launch.h" diff --git a/chrome/browser/policy/policy_helpers.cc b/chrome/browser/policy/policy_helpers.cc index a79640b..81e0150 100644 --- a/chrome/browser/policy/policy_helpers.cc +++ b/chrome/browser/policy/policy_helpers.cc @@ -4,6 +4,7 @@ #include "chrome/browser/policy/policy_helpers.h" +#include "build/build_config.h" #include "net/base/net_errors.h" #include "url/gurl.h" diff --git a/chrome/browser/policy/policy_network_browsertest.cc b/chrome/browser/policy/policy_network_browsertest.cc index ec2d90c..d69178a 100644 --- a/chrome/browser/policy/policy_network_browsertest.cc +++ b/chrome/browser/policy/policy_network_browsertest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/policy/policy_path_parser_linux.cc b/chrome/browser/policy/policy_path_parser_linux.cc index e0bed09..6dc2af4 100644 --- a/chrome/browser/policy/policy_path_parser_linux.cc +++ b/chrome/browser/policy/policy_path_parser_linux.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include <pwd.h> +#include <stddef.h> #include <sys/types.h> #include <unistd.h> diff --git a/chrome/browser/policy/policy_path_parser_mac.mm b/chrome/browser/policy/policy_path_parser_mac.mm index 3d834ae..1ac9558 100644 --- a/chrome/browser/policy/policy_path_parser_mac.mm +++ b/chrome/browser/policy/policy_path_parser_mac.mm @@ -4,20 +4,21 @@ #include "chrome/browser/policy/policy_path_parser.h" -#include "base/basictypes.h" -#include "base/files/file_path.h" -#include "base/logging.h" -#import "base/mac/scoped_nsautorelease_pool.h" -#include "base/strings/sys_string_conversions.h" -#include "policy/policy_constants.h" - #import <Cocoa/Cocoa.h> +#include <stddef.h> #import <SystemConfiguration/SCDynamicStore.h> #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #import <SystemConfiguration/SystemConfiguration.h> #include <string> +#include "base/files/file_path.h" +#include "base/logging.h" +#import "base/mac/scoped_nsautorelease_pool.h" +#include "base/macros.h" +#include "base/strings/sys_string_conversions.h" +#include "policy/policy_constants.h" + namespace policy { namespace path_parser { diff --git a/chrome/browser/policy/policy_path_parser_unittest.cc b/chrome/browser/policy/policy_path_parser_unittest.cc index b6437a4..54eea1a 100644 --- a/chrome/browser/policy/policy_path_parser_unittest.cc +++ b/chrome/browser/policy/policy_path_parser_unittest.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/files/file_path.h" +#include "build/build_config.h" #include "chrome/browser/policy/policy_path_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/policy_path_parser_win.cc b/chrome/browser/policy/policy_path_parser_win.cc index 2e0c197..d8c62c7 100644 --- a/chrome/browser/policy/policy_path_parser_win.cc +++ b/chrome/browser/policy/policy_path_parser_win.cc @@ -3,11 +3,13 @@ // found in the LICENSE file. #include <shlobj.h> +#include <stddef.h> #include <wtsapi32.h> #pragma comment(lib, "wtsapi32.lib") #include "chrome/browser/policy/policy_path_parser.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 2a0cc03..58ed38d 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_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 <algorithm> #include <cstdlib> #include <map> @@ -9,11 +11,11 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" @@ -23,6 +25,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/policy/policy_startup_browsertest.cc b/chrome/browser/policy/policy_startup_browsertest.cc index 85c6cc5..0f4d8e4 100644 --- a/chrome/browser/policy/policy_startup_browsertest.cc +++ b/chrome/browser/policy/policy_startup_browsertest.cc @@ -6,6 +6,7 @@ // PolicyMakeDefaultBrowserTest is not valid for this platform. #include "base/command_line.h" +#include "base/macros.h" #include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc index 945e774..e325634 100644 --- a/chrome/browser/policy/profile_policy_connector.cc +++ b/chrome/browser/policy/profile_policy_connector.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/cloud/cloud_policy_core.h" diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h index 8691447..86dedcf 100644 --- a/chrome/browser/policy/profile_policy_connector.h +++ b/chrome/browser/policy/profile_policy_connector.h @@ -8,8 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "components/keyed_service/core/keyed_service.h" namespace user_manager { diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc index 7ee2a6f..3d79592 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.cc +++ b/chrome/browser/policy/profile_policy_connector_factory.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/policy/profile_policy_connector_factory.h b/chrome/browser/policy/profile_policy_connector_factory.h index 42ad65a..b7ea5e9 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.h +++ b/chrome/browser/policy/profile_policy_connector_factory.h @@ -8,7 +8,7 @@ #include <list> #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_base_factory.h" diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc index 74d578f..07cb990 100644 --- a/chrome/browser/policy/profile_policy_connector_unittest.cc +++ b/chrome/browser/policy/profile_policy_connector_unittest.cc @@ -6,6 +6,7 @@ #include "base/run_loop.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/test/base/testing_browser_process.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/policy/core/browser/browser_policy_connector.h" diff --git a/chrome/browser/policy/schema_registry_service.h b/chrome/browser/policy/schema_registry_service.h index 316ba08..c2acbbf 100644 --- a/chrome/browser/policy/schema_registry_service.h +++ b/chrome/browser/policy/schema_registry_service.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_SCHEMA_REGISTRY_SERVICE_H_ #define CHROME_BROWSER_POLICY_SCHEMA_REGISTRY_SERVICE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/policy/schema_registry_service_factory.cc b/chrome/browser/policy/schema_registry_service_factory.cc index 01b3b4a..31826a9 100644 --- a/chrome/browser/policy/schema_registry_service_factory.cc +++ b/chrome/browser/policy/schema_registry_service_factory.cc @@ -5,6 +5,7 @@ #include "chrome/browser/policy/schema_registry_service_factory.h" #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/policy/schema_registry_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/policy/core/common/schema.h" diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc index 41838f9..26e1f72 100644 --- a/chrome/browser/policy/test/local_policy_test_server.cc +++ b/chrome/browser/policy/test/local_policy_test_server.cc @@ -5,6 +5,7 @@ #include "chrome/browser/policy/test/local_policy_test_server.h" #include <ctype.h> +#include <stdint.h> #include <algorithm> #include <vector> @@ -14,6 +15,7 @@ #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "crypto/rsa_private_key.h" #include "net/test/python_utils.h" @@ -89,7 +91,7 @@ bool LocalPolicyTestServer::SetSigningKeyAndSignature( const crypto::RSAPrivateKey* key, const std::string& signature) { CHECK(server_data_dir_.IsValid()); - std::vector<uint8> signing_key_bits; + std::vector<uint8_t> signing_key_bits; if (!key->ExportPrivateKey(&signing_key_bits)) return false; diff --git a/chrome/browser/policy/test/local_policy_test_server.h b/chrome/browser/policy/test/local_policy_test_server.h index a8e04aa..de7956f 100644 --- a/chrome/browser/policy/test/local_policy_test_server.h +++ b/chrome/browser/policy/test/local_policy_test_server.h @@ -7,10 +7,10 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/values.h" #include "net/test/spawned_test_server/local_test_server.h" #include "url/gurl.h" diff --git a/chrome/browser/power/process_power_collector.cc b/chrome/browser/power/process_power_collector.cc index 3583b57..f7cb500 100644 --- a/chrome/browser/power/process_power_collector.cc +++ b/chrome/browser/power/process_power_collector.cc @@ -6,6 +6,7 @@ #include "base/process/process_handle.h" #include "base/process/process_metrics.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/power/process_power_collector.h b/chrome/browser/power/process_power_collector.h index 533a575..f1c88d6 100644 --- a/chrome/browser/power/process_power_collector.h +++ b/chrome/browser/power/process_power_collector.h @@ -7,10 +7,12 @@ #include <map> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/process/process_handle.h" #include "base/process/process_metrics.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "components/power/origin_power_map_factory.h" #include "url/gurl.h" diff --git a/chrome/browser/power/process_power_collector_unittest.cc b/chrome/browser/power/process_power_collector_unittest.cc index 09424e4..352f26d 100644 --- a/chrome/browser/power/process_power_collector_unittest.cc +++ b/chrome/browser/power/process_power_collector_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/power/process_power_collector.h" +#include "build/build_config.h" #include "chrome/browser/apps/scoped_keep_alive.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/apps/chrome_app_delegate.h" diff --git a/chrome/browser/precache/precache_manager_factory.h b/chrome/browser/precache/precache_manager_factory.h index c9388d0..f65e844 100644 --- a/chrome/browser/precache/precache_manager_factory.h +++ b/chrome/browser/precache/precache_manager_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRECACHE_PRECACHE_MANAGER_FACTORY_H_ #define CHROME_BROWSER_PRECACHE_PRECACHE_MANAGER_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/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index 0f70fad..dd799b9 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -5,12 +5,14 @@ #include "chrome/browser/predictors/autocomplete_action_predictor.h" #include <math.h> +#include <stddef.h> #include <vector> #include "base/bind.h" #include "base/guid.h" #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h index 0a3ce18..823fdb6 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.h +++ b/chrome/browser/predictors/autocomplete_action_predictor.h @@ -8,6 +8,7 @@ #include <map> #include <tuple> +#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/predictors/autocomplete_action_predictor_factory.h b/chrome/browser/predictors/autocomplete_action_predictor_factory.h index d2b7f11..3dfcbb8 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_factory.h +++ b/chrome/browser/predictors/autocomplete_action_predictor_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_AUTOCOMPLETE_ACTION_PREDICTOR_FACTORY_H_ #define CHROME_BROWSER_PREDICTORS_AUTOCOMPLETE_ACTION_PREDICTOR_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/predictors/autocomplete_action_predictor_table.cc b/chrome/browser/predictors/autocomplete_action_predictor_table.cc index 73ed0c7..b797111 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_table.cc @@ -4,6 +4,8 @@ #include "chrome/browser/predictors/autocomplete_action_predictor_table.h" +#include <stddef.h> + #include "base/guid.h" #include "base/logging.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table.h b/chrome/browser/predictors/autocomplete_action_predictor_table.h index 5c2fb23..425c4b0 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table.h +++ b/chrome/browser/predictors/autocomplete_action_predictor_table.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/predictors/predictor_table_base.h" #include "url/gurl.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc index 717b749..0c96659b 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_table_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/message_loop/message_loop.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc index ffa1257..d89cd8c 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc @@ -4,9 +4,12 @@ #include "chrome/browser/predictors/autocomplete_action_predictor.h" +#include <stddef.h> + #include "base/auto_reset.h" #include "base/command_line.h" #include "base/guid.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/predictors/predictor_database.cc b/chrome/browser/predictors/predictor_database.cc index 1d8721a..2e65853 100644 --- a/chrome/browser/predictors/predictor_database.cc +++ b/chrome/browser/predictors/predictor_database.cc @@ -4,6 +4,8 @@ #include "chrome/browser/predictors/predictor_database.h" +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -119,7 +121,7 @@ void PredictorDatabaseInternal::LogDatabaseStats() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::DB) || !BrowserThread::IsMessageLoopValid(BrowserThread::DB)); - int64 db_size; + int64_t db_size; bool success = base::GetFileSize(db_path_, &db_size); DCHECK(success) << "Failed to get file size for " << db_path_.value(); UMA_HISTOGRAM_MEMORY_KB("PredictorDatabase.DatabaseSizeKB", diff --git a/chrome/browser/predictors/predictor_database.h b/chrome/browser/predictors/predictor_database.h index 385ea24..4bf4e5e 100644 --- a/chrome/browser/predictors/predictor_database.h +++ b/chrome/browser/predictors/predictor_database.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_PREDICTOR_DATABASE_H_ #define CHROME_BROWSER_PREDICTORS_PREDICTOR_DATABASE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/predictors/predictor_database_factory.h b/chrome/browser/predictors/predictor_database_factory.h index ead04ec..82c1e98 100644 --- a/chrome/browser/predictors/predictor_database_factory.h +++ b/chrome/browser/predictors/predictor_database_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_PREDICTOR_DATABASE_FACTORY_H_ #define CHROME_BROWSER_PREDICTORS_PREDICTOR_DATABASE_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/predictors/predictor_table_base.h b/chrome/browser/predictors/predictor_table_base.h index 2c115fb..601370e 100644 --- a/chrome/browser/predictors/predictor_table_base.h +++ b/chrome/browser/predictors/predictor_table_base.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_PREDICTOR_TABLE_BASE_H_ #define CHROME_BROWSER_PREDICTORS_PREDICTOR_TABLE_BASE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/cancellation_flag.h" diff --git a/chrome/browser/predictors/resource_prefetch_common.h b/chrome/browser/predictors/resource_prefetch_common.h index 9525b2b..0521f6c 100644 --- a/chrome/browser/predictors/resource_prefetch_common.h +++ b/chrome/browser/predictors/resource_prefetch_common.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_COMMON_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_COMMON_H_ +#include <stddef.h> + #include "base/time/time.h" #include "url/gurl.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index cba29d6..0b5235e 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc @@ -9,6 +9,7 @@ #include <utility> #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index 7152735..a0c9409 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor_factory.h b/chrome/browser/predictors/resource_prefetch_predictor_factory.h index bb275c3..3d26f5c 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_factory.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_FACTORY_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_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/predictors/resource_prefetch_predictor_tab_helper.h b/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h index e1d57e85..5cbabdc 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TAB_HELPER_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TAB_HELPER_H_ +#include "base/macros.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc index 89ebd7d..c8e6877 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc @@ -4,6 +4,8 @@ #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" +#include <stdint.h> + #include <algorithm> #include <utility> @@ -296,7 +298,7 @@ void ResourcePrefetchPredictorTables::GetAllDataHelper( PrefetchDataMap::iterator it = data_map->find(primary_key); if (it != data_map->end()) { - int64 last_visit = metadata_reader.ColumnInt64(1); + int64_t last_visit = metadata_reader.ColumnInt64(1); it->second.last_visit = base::Time::FromInternalValue(last_visit); } else { to_delete->push_back(primary_key); diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.h b/chrome/browser/predictors/resource_prefetch_predictor_tables.h index 84f0eba..18c9473 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.h @@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_ +#include <stddef.h> #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/predictors/predictor_table_base.h" #include "chrome/browser/predictors/resource_prefetch_common.h" diff --git a/chrome/browser/predictors/resource_prefetcher.h b/chrome/browser/predictors/resource_prefetcher.h index 1363a39..6ce3a45 100644 --- a/chrome/browser/predictors/resource_prefetcher.h +++ b/chrome/browser/predictors/resource_prefetcher.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCHER_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCHER_H_ +#include <stddef.h> + #include <list> #include <map> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/threading/thread_checker.h" diff --git a/chrome/browser/predictors/resource_prefetcher_manager.h b/chrome/browser/predictors/resource_prefetcher_manager.h index 335051e..8724975a 100644 --- a/chrome/browser/predictors/resource_prefetcher_manager.h +++ b/chrome/browser/predictors/resource_prefetcher_manager.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/predictors/resource_prefetch_common.h" #include "chrome/browser/predictors/resource_prefetcher.h" diff --git a/chrome/browser/predictors/resource_prefetcher_unittest.cc b/chrome/browser/predictors/resource_prefetcher_unittest.cc index 73098fa..302bdc1f 100644 --- a/chrome/browser/predictors/resource_prefetcher_unittest.cc +++ b/chrome/browser/predictors/resource_prefetcher_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 "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 6358cf6..80d4ae2 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -10,6 +10,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/invert_bubble_prefs.h" #include "chrome/browser/browser_process_impl.h" @@ -111,14 +112,14 @@ #include "chrome/browser/apps/shortcut_manager.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/api/commands/command_service.h" +#include "chrome/browser/extensions/api/copresence/copresence_api.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/signin/easy_unlock_service.h" +#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "extensions/browser/extension_prefs.h" -#include "chrome/browser/extensions/api/copresence/copresence_api.h" -#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #endif // defined(ENABLE_EXTENSIONS) #if defined(ENABLE_PLUGIN_INSTALLATION) diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h index 2d69a7d..89a5e2d 100644 --- a/chrome/browser/prefs/browser_prefs.h +++ b/chrome/browser/prefs/browser_prefs.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_ #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_ +#include "build/build_config.h" + class PrefRegistrySimple; class PrefService; class Profile; diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 4b313f4..b3e8f55 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/chrome_pref_service_factory.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/compiler_specific.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/prefs/default_pref_store.h" @@ -24,6 +27,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/chrome_pref_model_associator_client.h" #include "chrome/browser/prefs/command_line_pref_store.h" diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index b54d543..1a0a1ae 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -11,6 +11,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/command_line_pref_store.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 460cf2c..d452bd9 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -4,15 +4,19 @@ #include "chrome/browser/prefs/command_line_pref_store.h" +#include <stddef.h> + #include <string> #include <vector> #include "ash/ash_switches.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/string_split.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h index a9b9382..13468cb 100644 --- a/chrome/browser/prefs/command_line_pref_store.h +++ b/chrome/browser/prefs/command_line_pref_store.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_COMMAND_LINE_PREF_STORE_H_ #define CHROME_BROWSER_PREFS_COMMAND_LINE_PREF_STORE_H_ -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/value_map_pref_store.h" #include "base/values.h" diff --git a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc b/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc index 01aa882..f05ac53 100644 --- a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc @@ -5,8 +5,10 @@ #include "chrome/browser/prefs/command_line_pref_store.h" #include <gtest/gtest.h> +#include <stddef.h> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc index d1f5f16..060d143 100644 --- a/chrome/browser/prefs/command_line_pref_store_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. #include <gtest/gtest.h> +#include <stddef.h> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string_util.h" #include "base/values.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc index 543451d..929263a 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.cc +++ b/chrome/browser/prefs/incognito_mode_prefs.cc @@ -4,12 +4,16 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/features.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.h b/chrome/browser/prefs/incognito_mode_prefs.h index 3c00f7c..cbf30ef 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.h +++ b/chrome/browser/prefs/incognito_mode_prefs.h @@ -5,8 +5,9 @@ #ifndef CHROME_BROWSER_PREFS_INCOGNITO_MODE_PREFS_H_ #define CHROME_BROWSER_PREFS_INCOGNITO_MODE_PREFS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" +#include "build/build_config.h" class PrefService; class Profile; diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc index 14745d8..dbff424 100644 --- a/chrome/browser/prefs/pref_metrics_service.cc +++ b/chrome/browser/prefs/pref_metrics_service.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/pref_metrics_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h index db7fea3..b185f43 100644 --- a/chrome/browser/prefs/pref_metrics_service.h +++ b/chrome/browser/prefs/pref_metrics_service.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc index d50aa5c..9c57c4d 100644 --- a/chrome/browser/prefs/profile_pref_store_manager.cc +++ b/chrome/browser/prefs/profile_pref_store_manager.cc @@ -14,6 +14,7 @@ #include "base/prefs/persistent_pref_store.h" #include "base/prefs/pref_registry_simple.h" #include "base/sequenced_task_runner.h" +#include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/tracked/pref_hash_store_impl.h" diff --git a/chrome/browser/prefs/profile_pref_store_manager.h b/chrome/browser/prefs/profile_pref_store_manager.h index aa65a9a..a6223fe 100644 --- a/chrome/browser/prefs/profile_pref_store_manager.h +++ b/chrome/browser/prefs/profile_pref_store_manager.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 7be6135..843c22c 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/profile_pref_store_manager.h" +#include <stddef.h> + #include <vector> #include "base/compiler_specific.h" #include "base/files/file_enumerator.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/memory/scoped_ptr.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 51fb6c5..df053d5 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -4,11 +4,14 @@ #include "chrome/browser/prefs/session_startup_pref.h" +#include <stddef.h> + #include <string> #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" diff --git a/chrome/browser/prerender/external_prerender_handler_android.h b/chrome/browser/prerender/external_prerender_handler_android.h index 4430cbc..0186227 100644 --- a/chrome/browser/prerender/external_prerender_handler_android.h +++ b/chrome/browser/prerender/external_prerender_handler_android.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" class GURL; diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index f6b2e92..6160ff5 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_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 <deque> #include <vector> @@ -24,6 +26,7 @@ #include "base/test/histogram_tester.h" #include "base/test/test_timeouts.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" diff --git a/chrome/browser/prerender/prerender_config.h b/chrome/browser/prerender/prerender_config.h index 78fc9c4..440cb88 100644 --- a/chrome/browser/prerender/prerender_config.h +++ b/chrome/browser/prerender/prerender_config.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONFIG_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_CONFIG_H_ +#include <stddef.h> + #include <string> #include "base/time/time.h" diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 2b311ed..7a68274 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prerender/prerender_contents.h" +#include <stddef.h> + #include <algorithm> #include <functional> #include <utility> #include "base/bind.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/history/history_tab_helper.h" #include "chrome/browser/prerender/prerender_field_trial.h" @@ -759,7 +762,7 @@ void PrerenderContents::AddResourceThrottle( resource_throttles_.push_back(throttle); } -void PrerenderContents::AddNetworkBytes(int64 bytes) { +void PrerenderContents::AddNetworkBytes(int64_t bytes) { network_bytes_ += bytes; } diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 6d6fdd0..144ee61 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ +#include <stdint.h> + #include <string> #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -262,7 +265,7 @@ class PrerenderContents : public content::NotificationObserver, const base::WeakPtr<PrerenderResourceThrottle>& throttle); // Increments the number of bytes fetched over the network for this prerender. - void AddNetworkBytes(int64 bytes); + void AddNetworkBytes(int64_t bytes); protected: PrerenderContents(PrerenderManager* prerender_manager, @@ -314,7 +317,7 @@ class PrerenderContents : public content::NotificationObserver, // The session storage namespace id for use in matching. We must save it // rather than get it from the RenderViewHost since in the control group // we won't have a RenderViewHost. - int64 session_storage_namespace_id_; + int64_t session_storage_namespace_id_; private: class WebContentsDelegateImpl; @@ -399,7 +402,7 @@ class PrerenderContents : public content::NotificationObserver, // A running tally of the number of bytes this prerender has caused to be // transferred over the network for resources. Updated with AddNetworkBytes. - int64 network_bytes_; + int64_t network_bytes_; DISALLOW_COPY_AND_ASSIGN(PrerenderContents); }; diff --git a/chrome/browser/prerender/prerender_final_status.cc b/chrome/browser/prerender/prerender_final_status.cc index 3c7e8f9..849500d 100644 --- a/chrome/browser/prerender/prerender_final_status.cc +++ b/chrome/browser/prerender/prerender_final_status.cc @@ -4,6 +4,7 @@ #include "chrome/browser/prerender/prerender_final_status.h" +#include "base/macros.h" #include "chrome/browser/prerender/prerender_manager.h" namespace prerender { diff --git a/chrome/browser/prerender/prerender_handle.h b/chrome/browser/prerender/prerender_handle.h index e28bcf5..12699cd 100644 --- a/chrome/browser/prerender/prerender_handle.h +++ b/chrome/browser/prerender/prerender_handle.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_HANDLE_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_HANDLE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/prerender/prerender_histograms.cc b/chrome/browser/prerender/prerender_histograms.cc index 46a35ff..b7401d0 100644 --- a/chrome/browser/prerender/prerender_histograms.cc +++ b/chrome/browser/prerender/prerender_histograms.cc @@ -361,8 +361,8 @@ void PrerenderHistograms::RecordFinalStatus( void PrerenderHistograms::RecordNetworkBytes(Origin origin, bool used, - int64 prerender_bytes, - int64 profile_bytes) { + int64_t prerender_bytes, + int64_t profile_bytes) { const int kHistogramMin = 1; const int kHistogramMax = 100000000; // 100M. const int kBucketCount = 50; diff --git a/chrome/browser/prerender/prerender_histograms.h b/chrome/browser/prerender/prerender_histograms.h index 0f7bc40..2622def9 100644 --- a/chrome/browser/prerender/prerender_histograms.h +++ b/chrome/browser/prerender/prerender_histograms.h @@ -5,8 +5,12 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_HISTOGRAMS_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_HISTOGRAMS_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_final_status.h" @@ -102,8 +106,8 @@ class PrerenderHistograms { // RecordBytes. void RecordNetworkBytes(Origin origin, bool used, - int64 prerender_bytes, - int64 profile_bytes); + int64_t prerender_bytes, + int64_t profile_bytes); private: base::TimeTicks GetCurrentTimeTicks() const; diff --git a/chrome/browser/prerender/prerender_history.h b/chrome/browser/prerender/prerender_history.h index dff22e2b..1ace14d 100644 --- a/chrome/browser/prerender/prerender_history.h +++ b/chrome/browser/prerender/prerender_history.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_HISTORY_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_HISTORY_H_ +#include <stddef.h> + #include <list> +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" #include "chrome/browser/prerender/prerender_final_status.h" diff --git a/chrome/browser/prerender/prerender_history_unittest.cc b/chrome/browser/prerender/prerender_history_unittest.cc index 2da3c4b..19fef4a 100644 --- a/chrome/browser/prerender/prerender_history_unittest.cc +++ b/chrome/browser/prerender/prerender_history_unittest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/values.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" +#include "base/values.h" #include "chrome/browser/prerender/prerender_history.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc index ca3bc1a..7c9e3d2 100644 --- a/chrome/browser/prerender/prerender_link_manager.cc +++ b/chrome/browser/prerender/prerender_link_manager.cc @@ -47,7 +47,7 @@ bool ShouldStartRelNextPrerenders() { return experiment_name.find("Yes") != std::string::npos; } -bool ShouldStartPrerender(const uint32 rel_types) { +bool ShouldStartPrerender(const uint32_t rel_types) { const bool should_start_rel_next_prerenders = ShouldStartRelNextPrerenders(); @@ -73,14 +73,14 @@ enum RelTypeHistogramEnum { RelTypeHistogramEnumMax, }; -void RecordLinkManagerAdded(const uint32 rel_types) { - const uint32 enum_value = rel_types & (RelTypeHistogramEnumMax - 1); +void RecordLinkManagerAdded(const uint32_t rel_types) { + const uint32_t enum_value = rel_types & (RelTypeHistogramEnumMax - 1); UMA_HISTOGRAM_ENUMERATION("Prerender.RelTypesLinkAdded", enum_value, RelTypeHistogramEnumMax); } -void RecordLinkManagerStarting(const uint32 rel_types) { - const uint32 enum_value = rel_types & (RelTypeHistogramEnumMax - 1); +void RecordLinkManagerStarting(const uint32_t rel_types) { + const uint32_t enum_value = rel_types & (RelTypeHistogramEnumMax - 1); UMA_HISTOGRAM_ENUMERATION("Prerender.RelTypesLinkStarted", enum_value, RelTypeHistogramEnumMax); } @@ -162,7 +162,7 @@ PrerenderLinkManager::~PrerenderLinkManager() { void PrerenderLinkManager::OnAddPrerender(int launcher_child_id, int prerender_id, const GURL& url, - uint32 rel_types, + uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size, int render_view_route_id) { @@ -256,7 +256,7 @@ PrerenderLinkManager::LinkPrerender::LinkPrerender( int launcher_child_id, int prerender_id, const GURL& url, - uint32 rel_types, + uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size, int render_view_route_id, @@ -273,8 +273,7 @@ PrerenderLinkManager::LinkPrerender::LinkPrerender( deferred_launcher(deferred_launcher), handle(NULL), is_match_complete_replacement(false), - has_been_abandoned(false) { -} + has_been_abandoned(false) {} PrerenderLinkManager::LinkPrerender::~LinkPrerender() { DCHECK_EQ(static_cast<PrerenderHandle*>(NULL), handle) diff --git a/chrome/browser/prerender/prerender_link_manager.h b/chrome/browser/prerender/prerender_link_manager.h index a671c81..449c542 100644 --- a/chrome/browser/prerender/prerender_link_manager.h +++ b/chrome/browser/prerender/prerender_link_manager.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_LINK_MANAGER_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_LINK_MANAGER_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/prerender/prerender_handle.h" #include "components/keyed_service/core/keyed_service.h" @@ -47,7 +50,7 @@ class PrerenderLinkManager : public KeyedService, void OnAddPrerender(int child_id, int prerender_id, const GURL& url, - uint32 rel_types, + uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size, int render_view_route_id); @@ -76,7 +79,7 @@ class PrerenderLinkManager : public KeyedService, LinkPrerender(int launcher_child_id, int prerender_id, const GURL& url, - uint32 rel_types, + uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size, int render_view_route_id, @@ -88,7 +91,7 @@ class PrerenderLinkManager : public KeyedService, int launcher_child_id; int prerender_id; GURL url; - uint32 rel_types; + uint32_t rel_types; content::Referrer referrer; gfx::Size size; int render_view_route_id; diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 59ace6e..7ce35df 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -4,6 +4,8 @@ #include "chrome/browser/prerender/prerender_manager.h" +#include <stddef.h> + #include <algorithm> #include <functional> #include <string> @@ -13,6 +15,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -249,7 +252,7 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender( int process_id, int route_id, const GURL& url, - const uint32 rel_types, + const uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size) { Origin origin = rel_types & PrerenderRelTypePrerender ? @@ -1244,10 +1247,10 @@ void PrerenderManager::OnCreatingAudioStream(int render_process_id, void PrerenderManager::RecordNetworkBytes(Origin origin, bool used, - int64 prerender_bytes) { + int64_t prerender_bytes) { if (!ActuallyPrerendering()) return; - int64 recent_profile_bytes = + int64_t recent_profile_bytes = profile_network_bytes_ - last_recorded_profile_network_bytes_; last_recorded_profile_network_bytes_ = profile_network_bytes_; DCHECK_GE(recent_profile_bytes, 0); @@ -1261,7 +1264,7 @@ bool PrerenderManager::IsEnabled() const { return chrome_browser_net::CanPrefetchAndPrerenderUI(profile_->GetPrefs()); } -void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) { +void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64_t bytes) { DCHECK_GE(bytes, 0); if (IsEnabled() && ActuallyPrerendering()) profile_network_bytes_ += bytes; diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index e7a95e5..ab02cfe 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_ +#include <stdint.h> + #include <list> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" @@ -106,7 +109,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, int process_id, int route_id, const GURL& url, - uint32 rel_types, + uint32_t rel_types, const content::Referrer& referrer, const gfx::Size& size); @@ -268,14 +271,14 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // Notification that a prerender has completed and its bytes should be // recorded. - void RecordNetworkBytes(Origin origin, bool used, int64 prerender_bytes); + void RecordNetworkBytes(Origin origin, bool used, int64_t prerender_bytes); // Returns whether prerendering is currently enabled for this manager. bool IsEnabled() const; // Add to the running tally of bytes transferred over the network for this // profile if prerendering is currently enabled. - void AddProfileNetworkBytesIfEnabled(int64 bytes); + void AddProfileNetworkBytesIfEnabled(int64_t bytes); // Registers a new ProcessHost performing a prerender. Called by // PrerenderContents. @@ -525,10 +528,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // The number of bytes transferred over the network for the profile this // PrerenderManager is attached to. - int64 profile_network_bytes_; + int64_t profile_network_bytes_; // The value of profile_network_bytes_ that was last recorded. - int64 last_recorded_profile_network_bytes_; + int64_t last_recorded_profile_network_bytes_; // Set of process hosts being prerendered. typedef std::set<content::RenderProcessHost*> PrerenderProcessSet; diff --git a/chrome/browser/prerender/prerender_message_filter.cc b/chrome/browser/prerender/prerender_message_filter.cc index 351332c..d8d04de 100644 --- a/chrome/browser/prerender/prerender_message_filter.cc +++ b/chrome/browser/prerender/prerender_message_filter.cc @@ -5,6 +5,7 @@ #include "chrome/browser/prerender/prerender_message_filter.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/browser/prerender/prerender_link_manager.h" #include "chrome/browser/prerender/prerender_link_manager_factory.h" diff --git a/chrome/browser/prerender/prerender_message_filter.h b/chrome/browser/prerender/prerender_message_filter.h index 596a30a..76ae753 100644 --- a/chrome/browser/prerender/prerender_message_filter.h +++ b/chrome/browser/prerender/prerender_message_filter.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PRERENDER_PRERENDER_MESSAGE_FILTER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/keyed_service/core/keyed_service_shutdown_notifier.h" #include "content/public/browser/browser_message_filter.h" #include "url/gurl.h" diff --git a/chrome/browser/prerender/prerender_origin.cc b/chrome/browser/prerender/prerender_origin.cc index ae8d9ac..c5470ce 100644 --- a/chrome/browser/prerender/prerender_origin.cc +++ b/chrome/browser/prerender/prerender_origin.cc @@ -4,7 +4,7 @@ #include "chrome/browser/prerender/prerender_origin.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/prerender/prerender_resource_throttle.cc b/chrome/browser/prerender/prerender_resource_throttle.cc index d80cfb3..a23b5a9 100644 --- a/chrome/browser/prerender/prerender_resource_throttle.cc +++ b/chrome/browser/prerender/prerender_resource_throttle.cc @@ -4,6 +4,7 @@ #include "chrome/browser/prerender/prerender_resource_throttle.h" +#include "build/build_config.h" #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_util.h" diff --git a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc index 1802087..dcc365f 100644 --- a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc +++ b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc @@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h index d91987f..e672f10 100644 --- a/chrome/browser/prerender/prerender_tab_helper.h +++ b/chrome/browser/prerender/prerender_tab_helper.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 1a54e4b..cef708e 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.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 <stdint.h> + #include <map> #include <utility> #include "base/command_line.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" @@ -86,7 +90,7 @@ int DummyPrerenderContents::g_next_route_id_ = 0; const gfx::Size kSize(640, 480); -const uint32 kDefaultRelTypes = PrerenderRelTypePrerender; +const uint32_t kDefaultRelTypes = PrerenderRelTypePrerender; } // namespace diff --git a/chrome/browser/prerender/prerender_util.h b/chrome/browser/prerender/prerender_util.h index 3a9ec1f..fd236c7 100644 --- a/chrome/browser/prerender/prerender_util.h +++ b/chrome/browser/prerender/prerender_util.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_UTIL_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_UTIL_H_ -#include "base/basictypes.h" #include "url/gurl.h" namespace prerender { diff --git a/chrome/browser/printing/background_printing_manager.h b/chrome/browser/printing/background_printing_manager.h index fdcc952..0747603 100644 --- a/chrome/browser/printing/background_printing_manager.h +++ b/chrome/browser/printing/background_printing_manager.h @@ -9,6 +9,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index 9d678f2..86a4325 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -4,6 +4,8 @@ #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" +#include <stddef.h> + #include <stack> #include <vector> diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index 0b79508..fb07110 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc index a299a83..a14a5bd 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/command_line.h" @@ -53,7 +55,7 @@ class MockServiceProcessControl : public ServiceProcessControl { MOCK_METHOD0(Disconnect, void()); MOCK_METHOD1(OnMessageReceived, bool(const IPC::Message&)); - MOCK_METHOD1(OnChannelConnected, void(int32 peer_pid)); + MOCK_METHOD1(OnChannelConnected, void(int32_t peer_pid)); MOCK_METHOD0(OnChannelError, void()); MOCK_METHOD1(Send, bool(IPC::Message*)); @@ -116,31 +118,28 @@ void MockServiceProcessControl::SetConnectSuccessMockExpectations( } void MockServiceProcessControl::SetServiceEnabledExpectations() { - EXPECT_CALL( - *this, - Send(Property(&IPC::Message::type, - static_cast<int32>(ServiceMsg_GetCloudPrintProxyInfo::ID)))) - .Times(1).WillOnce( - DoAll( - DeleteArg<0>(), - WithoutArgs( - Invoke(this, &MockServiceProcessControl::SendEnabledInfo)))); + EXPECT_CALL(*this, Send(Property(&IPC::Message::type, + static_cast<int32_t>( + ServiceMsg_GetCloudPrintProxyInfo::ID)))) + .Times(1) + .WillOnce(DoAll(DeleteArg<0>(), + WithoutArgs(Invoke( + this, &MockServiceProcessControl::SendEnabledInfo)))); } void MockServiceProcessControl::SetServiceDisabledExpectations() { - EXPECT_CALL( - *this, - Send(Property(&IPC::Message::type, - static_cast<int32>(ServiceMsg_GetCloudPrintProxyInfo::ID)))) - .Times(1).WillOnce( - DoAll( - DeleteArg<0>(), - WithoutArgs( - Invoke(this, &MockServiceProcessControl::SendDisabledInfo)))); + EXPECT_CALL(*this, Send(Property(&IPC::Message::type, + static_cast<int32_t>( + ServiceMsg_GetCloudPrintProxyInfo::ID)))) + .Times(1) + .WillOnce( + DoAll(DeleteArg<0>(), + WithoutArgs(Invoke( + this, &MockServiceProcessControl::SendDisabledInfo)))); } void MockServiceProcessControl::SetWillBeEnabledExpectations() { - int32 message_id = ServiceMsg_EnableCloudPrintProxyWithRobot::ID; + int32_t message_id = ServiceMsg_EnableCloudPrintProxyWithRobot::ID; EXPECT_CALL( *this, Send(Property(&IPC::Message::type, message_id))) @@ -148,11 +147,11 @@ void MockServiceProcessControl::SetWillBeEnabledExpectations() { } void MockServiceProcessControl::SetWillBeDisabledExpectations() { - EXPECT_CALL( - *this, - Send(Property(&IPC::Message::type, - static_cast<int32>(ServiceMsg_DisableCloudPrintProxy::ID)))) - .Times(1).WillOnce(DoAll(DeleteArg<0>(), Return(true))); + EXPECT_CALL(*this, Send(Property(&IPC::Message::type, + static_cast<int32_t>( + ServiceMsg_DisableCloudPrintProxy::ID)))) + .Times(1) + .WillOnce(DoAll(DeleteArg<0>(), Return(true))); } bool MockServiceProcessControl::SendEnabledInfo() { diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc index 29e8c25..2efcf92 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc @@ -6,6 +6,7 @@ #include "base/process/kill.h" #include "base/process/launch.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc index 43ccc3f..6eeecd2 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc @@ -6,6 +6,8 @@ // to test launching the browser using the cloud print policy check command // line switch. +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" @@ -19,6 +21,7 @@ #include "base/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/service_process/service_process_control.h" @@ -129,13 +132,13 @@ class MockServiceIPCServer : public ServiceIPCServer { enabled_(true) { } MOCK_METHOD1(OnMessageReceived, bool(const IPC::Message& message)); - MOCK_METHOD1(OnChannelConnected, void(int32 peer_pid)); + MOCK_METHOD1(OnChannelConnected, void(int32_t peer_pid)); MOCK_METHOD0(OnChannelError, void()); void SetServiceEnabledExpectations(); void SetWillBeDisabledExpectations(); - void CallServiceOnChannelConnected(int32 peer_pid) { + void CallServiceOnChannelConnected(int32_t peer_pid) { ServiceIPCServer::OnChannelConnected(peer_pid); } @@ -160,32 +163,30 @@ void MockServiceIPCServer::SetServiceEnabledExpectations() { EXPECT_CALL(*this, OnMessageReceived(_)).Times(0); EXPECT_CALL(*this, - OnMessageReceived( - Property(&IPC::Message::type, - static_cast<int32>(ServiceMsg_GetCloudPrintProxyInfo::ID)))) - .Times(AnyNumber()).WillRepeatedly( + OnMessageReceived(Property( + &IPC::Message::type, + static_cast<int32_t>(ServiceMsg_GetCloudPrintProxyInfo::ID)))) + .Times(AnyNumber()) + .WillRepeatedly( WithoutArgs(Invoke(this, &MockServiceIPCServer::SendInfo))); - EXPECT_CALL(*this, - OnMessageReceived( - Property(&IPC::Message::type, - static_cast<int32>(ServiceMsg_Shutdown::ID)))) + EXPECT_CALL(*this, OnMessageReceived(Property( + &IPC::Message::type, + static_cast<int32_t>(ServiceMsg_Shutdown::ID)))) .Times(1) - .WillOnce( - DoAll(Assign(&g_good_shutdown, true), - WithoutArgs( - Invoke(g_service_process, &ServiceProcess::Shutdown)), - Return(true))); + .WillOnce(DoAll( + Assign(&g_good_shutdown, true), + WithoutArgs(Invoke(g_service_process, &ServiceProcess::Shutdown)), + Return(true))); } void MockServiceIPCServer::SetWillBeDisabledExpectations() { SetServiceEnabledExpectations(); EXPECT_CALL(*this, - OnMessageReceived( - Property(&IPC::Message::type, - static_cast<int32>( - ServiceMsg_DisableCloudPrintProxy::ID)))) + OnMessageReceived(Property( + &IPC::Message::type, + static_cast<int32_t>(ServiceMsg_DisableCloudPrintProxy::ID)))) .Times(AtLeast(1)) .WillRepeatedly(DoAll(Assign(&enabled_, false), Return(true))); } @@ -319,7 +320,7 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, // IPC::Listener implementation bool OnMessageReceived(const IPC::Message& message) override { return false; } - void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32_t peer_pid) override; // MultiProcessTest implementation. base::CommandLine MakeCmdLine(const std::string& procname) override; @@ -487,7 +488,7 @@ void CloudPrintProxyPolicyStartupTest::ShutdownAndWaitForExitWithTimeout( EXPECT_EQ(exit_code, 0); } -void CloudPrintProxyPolicyStartupTest::OnChannelConnected(int32 peer_pid) { +void CloudPrintProxyPolicyStartupTest::OnChannelConnected(int32_t peer_pid) { observer_.Notify(); } diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc index 071327e..8656dd5 100644 --- a/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chrome/browser/printing/pdf_to_emf_converter.cc @@ -4,6 +4,8 @@ #include "chrome/browser/printing/pdf_to_emf_converter.h" +#include <stdint.h> + #include <queue> #include <utility> @@ -11,6 +13,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/chrome_utility_printing_messages.h" #include "chrome/grit/generated_resources.h" @@ -267,7 +270,7 @@ void LazyEmf::Close() const { bool LazyEmf::LoadEmf(Emf* emf) const { file_->Seek(base::File::FROM_BEGIN, 0); - int64 size = file_->GetLength(); + int64_t size = file_->GetLength(); if (size <= 0) return false; std::vector<char> data(size); diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 1d061aa..8be3444 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -5,6 +5,7 @@ #include "chrome/browser/printing/print_dialog_cloud.h" #include "base/bind.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/printing/print_dialog_cloud.h b/chrome/browser/printing/print_dialog_cloud.h index 9ba434e..5be0ba1 100644 --- a/chrome/browser/printing/print_dialog_cloud.h +++ b/chrome/browser/printing/print_dialog_cloud.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" class Browser; diff --git a/chrome/browser/printing/print_dialog_cloud_win.cc b/chrome/browser/printing/print_dialog_cloud_win.cc index 8f8c699..8088729 100644 --- a/chrome/browser/printing/print_dialog_cloud_win.cc +++ b/chrome/browser/printing/print_dialog_cloud_win.cc @@ -4,12 +4,16 @@ #include "chrome/browser/printing/print_dialog_cloud.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 6da0aa0..bb05e14 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -12,6 +12,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "base/threading/worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job_worker.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index c468bbd..7cf1bce 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h @@ -5,10 +5,11 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_H_ #define CHROME_BROWSER_PRINTING_PRINT_JOB_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/printing/print_job_worker_owner.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h index 22c72bb..245a3b3 100644 --- a/chrome/browser/printing/print_job_manager.h +++ b/chrome/browser/printing/print_job_manager.h @@ -9,6 +9,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 0b2552e..e7cdf14 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -13,6 +13,7 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index 9958811..83d8b35 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_WORKER_H_ #define CHROME_BROWSER_PRINTING_PRINT_JOB_WORKER_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/printing/print_preview_context_menu_observer.h b/chrome/browser/printing/print_preview_context_menu_observer.h index e1a11ef..1ada0bf 100644 --- a/chrome/browser/printing/print_preview_context_menu_observer.h +++ b/chrome/browser/printing/print_preview_context_menu_observer.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_CONTEXT_MENU_OBSERVER_H_ #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_CONTEXT_MENU_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/renderer_context_menu/render_view_context_menu_observer.h" namespace content { diff --git a/chrome/browser/printing/print_preview_data_service.cc b/chrome/browser/printing/print_preview_data_service.cc index ecf9191..53b068c 100644 --- a/chrome/browser/printing/print_preview_data_service.cc +++ b/chrome/browser/printing/print_preview_data_service.cc @@ -4,6 +4,7 @@ #include "chrome/browser/printing/print_preview_data_service.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" #include "base/stl_util.h" diff --git a/chrome/browser/printing/print_preview_data_service.h b/chrome/browser/printing/print_preview_data_service.h index af7aa84..c553581 100644 --- a/chrome/browser/printing/print_preview_data_service.h +++ b/chrome/browser/printing/print_preview_data_service.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DATA_SERVICE_H_ #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DATA_SERVICE_H_ +#include <stdint.h> + #include <map> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" class PrintPreviewDataStore; diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc index 6937e13..3b75f18 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.cc +++ b/chrome/browser/printing/print_preview_dialog_controller.cc @@ -4,13 +4,17 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> #include "base/auto_reset.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" diff --git a/chrome/browser/printing/print_preview_dialog_controller.h b/chrome/browser/printing/print_preview_dialog_controller.h index 7544f33..091c508 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.h +++ b/chrome/browser/printing/print_preview_dialog_controller.h @@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/sessions/core/session_id.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 191e674..1a2814c5 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -4,11 +4,13 @@ #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #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/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc index cb755e0..5b6c4571 100644 --- a/chrome/browser/printing/print_preview_message_handler.cc +++ b/chrome/browser/printing/print_preview_message_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/printing/print_preview_message_handler.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" diff --git a/chrome/browser/printing/print_preview_message_handler.h b/chrome/browser/printing/print_preview_message_handler.h index 0b404cc..25abc6a 100644 --- a/chrome/browser/printing/print_preview_message_handler.h +++ b/chrome/browser/printing/print_preview_message_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc index 6a34e20..18879b2 100644 --- a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc +++ b/chrome/browser/printing/print_preview_pdf_generated_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 <algorithm> #include <fstream> #include <iostream> @@ -19,6 +21,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/md5.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -27,6 +30,7 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/printing/print_preview_test.h b/chrome/browser/printing/print_preview_test.h index 50d56dc..ffd76ff 100644 --- a/chrome/browser/printing/print_preview_test.h +++ b/chrome/browser/printing/print_preview_test.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TEST_H_ #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TEST_H_ +#include "base/macros.h" #include "chrome/test/base/browser_with_test_window_test.h" class PrintPreviewTest : public BrowserWithTestWindowTest { diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h index 45e840b..a5345e2 100644 --- a/chrome/browser/printing/print_view_manager.h +++ b/chrome/browser/printing/print_view_manager.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_H_ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_H_ +#include "base/macros.h" #include "chrome/browser/printing/print_view_manager_base.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 421bb1e..e4182f2 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -13,6 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index bb23797..7b57ea2 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h @@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_member.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "components/printing/browser/print_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/printing/print_view_manager_basic.cc b/chrome/browser/printing/print_view_manager_basic.cc index 2532486..6ac06d6 100644 --- a/chrome/browser/printing/print_view_manager_basic.cc +++ b/chrome/browser/printing/print_view_manager_basic.cc @@ -4,6 +4,8 @@ #include "chrome/browser/printing/print_view_manager_basic.h" +#include "build/build_config.h" + #if defined(OS_ANDROID) #include "base/bind.h" #include "printing/printing_context_android.h" diff --git a/chrome/browser/printing/print_view_manager_basic.h b/chrome/browser/printing/print_view_manager_basic.h index 6a3fdd5..bada715 100644 --- a/chrome/browser/printing/print_view_manager_basic.h +++ b/chrome/browser/printing/print_view_manager_basic.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASIC_H_ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASIC_H_ +#include "base/macros.h" #include "chrome/browser/printing/print_view_manager_base.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/printing/printer_manager_dialog.h b/chrome/browser/printing/printer_manager_dialog.h index 2f94e96..6a1df0c 100644 --- a/chrome/browser/printing/printer_manager_dialog.h +++ b/chrome/browser/printing/printer_manager_dialog.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINTER_MANAGER_DIALOG_H_ #define CHROME_BROWSER_PRINTING_PRINTER_MANAGER_DIALOG_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace printing { diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index 8c35163..0a24336 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/printing/print_job_worker_owner.h" #include "printing/print_job_constants.h" diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 4d64753..7567975 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -6,6 +6,7 @@ #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/process/process_handle.h" diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index b0f2813..60a839a 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/printer_query.h" @@ -335,7 +336,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( } #if defined(ENABLE_PRINT_PREVIEW) -void PrintingMessageFilter::OnCheckForCancel(int32 preview_ui_id, +void PrintingMessageFilter::OnCheckForCancel(int32_t preview_ui_id, int preview_request_id, bool* cancel) { PrintPreviewUI::GetCurrentPrintPreviewStatus(preview_ui_id, diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index 820eece..79fabde 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -5,10 +5,14 @@ #ifndef CHROME_BROWSER_PRINTING_PRINTING_MESSAGE_FILTER_H_ #define CHROME_BROWSER_PRINTING_PRINTING_MESSAGE_FILTER_H_ +#include <stdint.h> + #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" +#include "build/build_config.h" #include "content/public/browser/browser_message_filter.h" #if defined(OS_WIN) @@ -102,7 +106,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { #if defined(ENABLE_PRINT_PREVIEW) // Check to see if print preview has been cancelled. - void OnCheckForCancel(int32 preview_ui_id, + void OnCheckForCancel(int32_t preview_ui_id, int preview_request_id, bool* cancel); #endif diff --git a/chrome/browser/private_working_set_snapshot.h b/chrome/browser/private_working_set_snapshot.h index 90897f8..d4286b1 100644 --- a/chrome/browser/private_working_set_snapshot.h +++ b/chrome/browser/private_working_set_snapshot.h @@ -9,9 +9,11 @@ #if defined(OS_WIN) #include <pdh.h> +#include <stddef.h> #include <vector> +#include "base/macros.h" #include "base/process/process_handle.h" #include "base/win/scoped_handle.h" diff --git a/chrome/browser/private_working_set_snapshot_win.cc b/chrome/browser/private_working_set_snapshot_win.cc index 0a0303a..8c16fdb 100644 --- a/chrome/browser/private_working_set_snapshot_win.cc +++ b/chrome/browser/private_working_set_snapshot_win.cc @@ -6,6 +6,7 @@ #include <pdh.h> #include <pdhmsg.h> +#include <stddef.h> #include <algorithm> diff --git a/chrome/browser/private_working_set_snapshot_win_unittest.cc b/chrome/browser/private_working_set_snapshot_win_unittest.cc index 1ec2f30..ccc2e01 100644 --- a/chrome/browser/private_working_set_snapshot_win_unittest.cc +++ b/chrome/browser/private_working_set_snapshot_win_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/private_working_set_snapshot.h" +#include <stddef.h> + #include "base/win/windows_version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/process_info_snapshot.h b/chrome/browser/process_info_snapshot.h index 575fbe2..a1664a4 100644 --- a/chrome/browser/process_info_snapshot.h +++ b/chrome/browser/process_info_snapshot.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROCESS_INFO_SNAPSHOT_H_ #define CHROME_BROWSER_PROCESS_INFO_SNAPSHOT_H_ +#include <stddef.h> +#include <stdint.h> #include <sys/types.h> #include <map> diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc index f2a0019..7bfadc8 100644 --- a/chrome/browser/process_info_snapshot_mac.cc +++ b/chrome/browser/process_info_snapshot_mac.cc @@ -4,6 +4,8 @@ #include "chrome/browser/process_info_snapshot.h" +#include <stddef.h> +#include <stdint.h> #include <sys/sysctl.h> #include <sstream> @@ -12,6 +14,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/mac_util.h" +#include "base/macros.h" #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -139,7 +142,7 @@ static bool GetProcessMemoryInfoUsingPS( for (std::vector<base::ProcessId>::const_iterator it = pid_list.begin(); it != pid_list.end(); ++it) { command_line.AppendArg("-p"); - command_line.AppendArg(base::Int64ToString(static_cast<int64>(*it))); + command_line.AppendArg(base::Int64ToString(static_cast<int64_t>(*it))); } std::string output; diff --git a/chrome/browser/process_info_snapshot_mac_unittest.cc b/chrome/browser/process_info_snapshot_mac_unittest.cc index e95cf0c..25e084b 100644 --- a/chrome/browser/process_info_snapshot_mac_unittest.cc +++ b/chrome/browser/process_info_snapshot_mac_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/process_info_snapshot.h" +#include <stdint.h> #include <sys/types.h> // For |uid_t| (and |pid_t|). #include <unistd.h> // For |getpid()|, |getuid()|, etc. @@ -31,10 +32,10 @@ TEST_F(ProcessInfoSnapshotMacTest, FindPidOneTest) { ProcessInfoSnapshot::ProcInfoEntry proc_info; ASSERT_TRUE(snapshot.GetProcInfo(1, &proc_info)); - EXPECT_EQ(1, static_cast<int64>(proc_info.pid)); - EXPECT_EQ(0, static_cast<int64>(proc_info.ppid)); - EXPECT_EQ(0, static_cast<int64>(proc_info.uid)); - EXPECT_EQ(0, static_cast<int64>(proc_info.euid)); + EXPECT_EQ(1, static_cast<int64_t>(proc_info.pid)); + EXPECT_EQ(0, static_cast<int64_t>(proc_info.ppid)); + EXPECT_EQ(0, static_cast<int64_t>(proc_info.uid)); + EXPECT_EQ(0, static_cast<int64_t>(proc_info.euid)); EXPECT_GE(proc_info.rss, 0u); EXPECT_GT(proc_info.vsize, 0u); @@ -62,7 +63,7 @@ TEST_F(ProcessInfoSnapshotMacTest, FindPidSelfTest) { base::ProcessId ppid = static_cast<base::ProcessId>(getppid()); uid_t uid = getuid(); uid_t euid = geteuid(); - EXPECT_NE(static_cast<int64>(ppid), 0); + EXPECT_NE(static_cast<int64_t>(ppid), 0); std::vector<base::ProcessId> pid_list; pid_list.push_back(pid); @@ -94,7 +95,7 @@ TEST_F(ProcessInfoSnapshotMacTest, FindPidSelfTest) { // Find our parent. ASSERT_TRUE(snapshot.GetProcInfo(ppid, &proc_info)); EXPECT_EQ(ppid, proc_info.pid); - EXPECT_NE(static_cast<int64>(proc_info.ppid), 0); + EXPECT_NE(static_cast<int64_t>(proc_info.ppid), 0); EXPECT_EQ(uid, proc_info.uid); // This (and the following) should be true EXPECT_EQ(euid, proc_info.euid); // under reasonable circumstances. // Can't say anything definite about its |rss|. diff --git a/chrome/browser/process_resource_usage.h b/chrome/browser/process_resource_usage.h index 5f58bb9..667cb63 100644 --- a/chrome/browser/process_resource_usage.h +++ b/chrome/browser/process_resource_usage.h @@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_PROCESS_RESOURCE_USAGE_H_ #define CHROME_BROWSER_PROCESS_RESOURCE_USAGE_H_ +#include <stddef.h> + #include <deque> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "chrome/common/resource_usage_reporter.mojom.h" #include "third_party/WebKit/public/web/WebCache.h" diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 3260c4e..fe11a190 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -14,11 +14,11 @@ #include <set> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "base/threading/non_thread_safe.h" diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index 5ea8dd6..90b08b5 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc @@ -10,11 +10,14 @@ // makes sense to test that the system services are giving the behavior we // want?) +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/process/launch.h" @@ -24,6 +27,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/process_singleton_modal_dialog_lock.cc b/chrome/browser/process_singleton_modal_dialog_lock.cc index 98627c1..62a20e5 100644 --- a/chrome/browser/process_singleton_modal_dialog_lock.cc +++ b/chrome/browser/process_singleton_modal_dialog_lock.cc @@ -12,6 +12,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "build/build_config.h" namespace { diff --git a/chrome/browser/process_singleton_modal_dialog_lock.h b/chrome/browser/process_singleton_modal_dialog_lock.h index 73b7e7c1..e597668 100644 --- a/chrome/browser/process_singleton_modal_dialog_lock.h +++ b/chrome/browser/process_singleton_modal_dialog_lock.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROCESS_SINGLETON_MODAL_DIALOG_LOCK_H_ #define CHROME_BROWSER_PROCESS_SINGLETON_MODAL_DIALOG_LOCK_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "chrome/browser/process_singleton.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index bc89b11..0d5b6b0 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc @@ -52,14 +52,16 @@ #include <set> #include <string> +#include <stddef.h> + #include "base/base_paths.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" @@ -77,6 +79,7 @@ #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc index 48d9d2f..8fc6fff 100644 --- a/chrome/browser/process_singleton_posix_unittest.cc +++ b/chrome/browser/process_singleton_posix_unittest.cc @@ -6,6 +6,7 @@ #include <fcntl.h> #include <signal.h> +#include <stddef.h> #include <sys/types.h> #include <sys/un.h> #include <sys/wait.h> @@ -27,6 +28,7 @@ #include "base/test/test_timeouts.h" #include "base/test/thread_test_helper.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "content/public/test/test_browser_thread.h" #include "net/base/net_util.h" diff --git a/chrome/browser/process_singleton_startup_lock.h b/chrome/browser/process_singleton_startup_lock.h index 187dd35..9aa69ad 100644 --- a/chrome/browser/process_singleton_startup_lock.h +++ b/chrome/browser/process_singleton_startup_lock.h @@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/process_singleton.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 623aa7f..4aea500 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -5,11 +5,13 @@ #include "chrome/browser/process_singleton.h" #include <shellapi.h> +#include <stddef.h> #include "base/base_paths.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/process/process.h" #include "base/process/process_info.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc index 332c5a2..dad6dce 100644 --- a/chrome/browser/process_singleton_win_unittest.cc +++ b/chrome/browser/process_singleton_win_unittest.cc @@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/process/launch.h" #include "base/process/process.h" diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc index 117fa16..c381f6c 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc @@ -4,6 +4,9 @@ #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h index d0bc537..356ebf4 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.h b/chrome/browser/profile_resetter/brandcoded_default_settings.h index 2de4041..5365083 100644 --- a/chrome/browser/profile_resetter/brandcoded_default_settings.h +++ b/chrome/browser/profile_resetter/brandcoded_default_settings.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/values.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index 346f47c..9db027b 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc @@ -4,11 +4,15 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/synchronization/cancellation_flag.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h index e230a15..fad3dd6 100644 --- a/chrome/browser/profile_resetter/profile_resetter.h +++ b/chrome/browser/profile_resetter/profile_resetter.h @@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ +#include <stdint.h> + #include <utility> #include <vector> -#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/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -50,7 +52,7 @@ class ProfileResetter : public base::NonThreadSafe, }; // Bit vector for Resettable enum. - typedef uint32 ResettableFlags; + typedef uint32_t ResettableFlags; static_assert(sizeof(ResettableFlags) == sizeof(Resettable), "ResettableFlags should be the same size as Resettable"); diff --git a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc index 8b0581b..00dd1c3 100644 --- a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" #include "base/bind.h" +#include "base/macros.h" #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/profile_resetter/profile_resetter_test_base.h b/chrome/browser/profile_resetter/profile_resetter_test_base.h index 178035c..29322d1 100644 --- a/chrome/browser/profile_resetter/profile_resetter_test_base.h +++ b/chrome/browser/profile_resetter/profile_resetter_test_base.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_TEST_BASE_H_ #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_TEST_BASE_H_ +#include "base/macros.h" #include "chrome/browser/profile_resetter/profile_resetter.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 1378743..0543ea1 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -4,11 +4,15 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" +#include <stddef.h> + #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" diff --git a/chrome/browser/profile_resetter/reset_report_uploader.h b/chrome/browser/profile_resetter/reset_report_uploader.h index 791f0a2..a710c101 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader.h +++ b/chrome/browser/profile_resetter/reset_report_uploader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/keyed_service/core/keyed_service.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/profile_resetter/reset_report_uploader_factory.h b/chrome/browser/profile_resetter/reset_report_uploader_factory.h index b32c7eb..dd4a01b 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader_factory.h +++ b/chrome/browser/profile_resetter/reset_report_uploader_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_FACTORY_H_ #define CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base { diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.h b/chrome/browser/profile_resetter/resettable_settings_snapshot.h index d935ded..55d78dd 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.h +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter.h b/chrome/browser/profile_resetter/triggered_profile_resetter.h index 7e27903..45aa88d 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter.h +++ b/chrome/browser/profile_resetter/triggered_profile_resetter.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_TRIGGERED_PROFILE_RESETTER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_TRIGGERED_PROFILE_RESETTER_H_ +#include <stddef.h> + #include "base/macros.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc index 10a2fea..625f69f 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc +++ b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "chrome/browser/profile_resetter/triggered_profile_resetter.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc index d2e07c2..f29b432 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc +++ b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc @@ -60,7 +60,7 @@ void TriggeredProfileResetter::Activate() { // in this profile. If different, reset the profile and persist the new // time. PrefService* pref_service = profile_->GetPrefs(); - const int64 preference_timestamp = + const int64_t preference_timestamp = pref_service->GetInt64(prefs::kLastProfileResetTimestamp); if (profile_->IsNewProfile()) { diff --git a/chrome/browser/profiles/avatar_menu.cc b/chrome/browser/profiles/avatar_menu.cc index 2b5a592..64978fc 100644 --- a/chrome/browser/profiles/avatar_menu.cc +++ b/chrome/browser/profiles/avatar_menu.cc @@ -9,6 +9,7 @@ #include "base/metrics/field_trial.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/avatar_menu_actions.h" diff --git a/chrome/browser/profiles/avatar_menu.h b/chrome/browser/profiles/avatar_menu.h index 94ed64a..6b420a0 100644 --- a/chrome/browser/profiles/avatar_menu.h +++ b/chrome/browser/profiles/avatar_menu.h @@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_ #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_ +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" diff --git a/chrome/browser/profiles/avatar_menu_actions.h b/chrome/browser/profiles/avatar_menu_actions.h index ec49fe9..3ae7515 100644 --- a/chrome/browser/profiles/avatar_menu_actions.h +++ b/chrome/browser/profiles/avatar_menu_actions.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_ACTIONS_H_ #define CHROME_BROWSER_PROFILES_AVATAR_MENU_ACTIONS_H_ +#include <stddef.h> + #include <string> #include "chrome/browser/profiles/avatar_menu.h" diff --git a/chrome/browser/profiles/avatar_menu_actions_desktop.cc b/chrome/browser/profiles/avatar_menu_actions_desktop.cc index 97102ed..faba359 100644 --- a/chrome/browser/profiles/avatar_menu_actions_desktop.cc +++ b/chrome/browser/profiles/avatar_menu_actions_desktop.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/avatar_menu_actions_desktop.h b/chrome/browser/profiles/avatar_menu_actions_desktop.h index a015c37..cc95ff1 100644 --- a/chrome/browser/profiles/avatar_menu_actions_desktop.h +++ b/chrome/browser/profiles/avatar_menu_actions_desktop.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_ACTIONS_DESKTOP_H_ #define CHROME_BROWSER_PROFILES_AVATAR_MENU_ACTIONS_DESKTOP_H_ +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "chrome/browser/profiles/avatar_menu_actions.h" #include "chrome/browser/profiles/profile_metrics.h" diff --git a/chrome/browser/profiles/avatar_menu_desktop.cc b/chrome/browser/profiles/avatar_menu_desktop.cc index 2f5fcba..7e7e133 100644 --- a/chrome/browser/profiles/avatar_menu_desktop.cc +++ b/chrome/browser/profiles/avatar_menu_desktop.cc @@ -4,6 +4,8 @@ #include "chrome/browser/profiles/avatar_menu.h" +#include <stddef.h> + #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.h b/chrome/browser/profiles/bookmark_model_loaded_observer.h index f23e1a6..b4ef0d2 100644 --- a/chrome/browser/profiles/bookmark_model_loaded_observer.h +++ b/chrome/browser/profiles/bookmark_model_loaded_observer.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_BOOKMARK_MODEL_LOADED_OBSERVER_H_ #define CHROME_BROWSER_PROFILES_BOOKMARK_MODEL_LOADED_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" class Profile; diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc index 8b4ece1..0cbefeb 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc @@ -4,6 +4,7 @@ #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" +#include "build/build_config.h" #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h index f20e834..8b366bc 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_CHROME_BROWSER_MAIN_EXTRA_PARTS_PROFILES_H_ #define CHROME_BROWSER_PROFILES_CHROME_BROWSER_MAIN_EXTRA_PARTS_PROFILES_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" class ChromeBrowserMainParts; diff --git a/chrome/browser/profiles/chrome_version_service.h b/chrome/browser/profiles/chrome_version_service.h index 4102c45..5384e08 100644 --- a/chrome/browser/profiles/chrome_version_service.h +++ b/chrome/browser/profiles/chrome_version_service.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" class PrefService; diff --git a/chrome/browser/profiles/gaia_info_update_service.cc b/chrome/browser/profiles/gaia_info_update_service.cc index 0c8115c..dc8104d 100644 --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc @@ -4,8 +4,11 @@ #include "chrome/browser/profiles/gaia_info_update_service.h" +#include <stddef.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/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h index 17cab93..32bc73f 100644 --- a/chrome/browser/profiles/gaia_info_update_service.h +++ b/chrome/browser/profiles/gaia_info_update_service.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/profiles/profile_downloader.h" diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.h b/chrome/browser/profiles/gaia_info_update_service_factory.h index 01dcadb..0370a0d 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.h +++ b/chrome/browser/profiles/gaia_info_update_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_FACTORY_H_ #define CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_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/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index 914f824..ac05fae 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -4,8 +4,11 @@ #include "chrome/browser/profiles/gaia_info_update_service.h" +#include <stddef.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/profiles/profile_downloader.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc index 170eb92..3486b1f 100644 --- a/chrome/browser/profiles/host_zoom_map_browsertest.cc +++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc @@ -4,6 +4,8 @@ #include "content/public/browser/host_zoom_map.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/command_line.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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.h b/chrome/browser/profiles/incognito_mode_policy_handler.h index 4d16637f..a37c609 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler.h +++ b/chrome/browser/profiles/incognito_mode_policy_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_INCOGNITO_MODE_POLICY_HANDLER_H_ #define CHROME_BROWSER_PROFILES_INCOGNITO_MODE_POLICY_HANDLER_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" class PrefValueMap; diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h index 17e2a0c..8cd1fe5 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.h +++ b/chrome/browser/profiles/off_the_record_profile_impl.h @@ -7,6 +7,8 @@ #include <string> +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/profiles/off_the_record_profile_io_data.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index d3fb0aac..764a213 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/threading/worker_pool.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index ae229bd..87355a9 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IO_DATA_H_ -#include "base/basictypes.h" #include "base/callback.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/memory/scoped_ptr.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 0e55daf..1339c4e 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -9,9 +9,10 @@ #include <string> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/logging.h" +#include "base/macros.h" +#include "build/build_config.h" #include "components/domain_reliability/clear_mode.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" diff --git a/chrome/browser/profiles/profile_attributes_entry.h b/chrome/browser/profiles/profile_attributes_entry.h index 3fdbdd6..081c5c5 100644 --- a/chrome/browser/profiles/profile_attributes_entry.h +++ b/chrome/browser/profiles/profile_attributes_entry.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_ATTRIBUTES_ENTRY_H_ #define CHROME_BROWSER_PROFILES_PROFILE_ATTRIBUTES_ENTRY_H_ +#include <stddef.h> + #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/time/time.h" diff --git a/chrome/browser/profiles/profile_attributes_storage.h b/chrome/browser/profiles/profile_attributes_storage.h index e9026c5..67b82af 100644 --- a/chrome/browser/profiles/profile_attributes_storage.h +++ b/chrome/browser/profiles/profile_attributes_storage.h @@ -5,6 +5,10 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_ATTRIBUTES_STORAGE_H_ #define CHROME_BROWSER_PROFILES_PROFILE_ATTRIBUTES_STORAGE_H_ +#include <stddef.h> + +#include "base/macros.h" + class ProfileAttributesEntry; class ProfileAttributesStorage { diff --git a/chrome/browser/profiles/profile_attributes_storage_unittest.cc b/chrome/browser/profiles/profile_attributes_storage_unittest.cc index 15bb566..101eaea 100644 --- a/chrome/browser/profiles/profile_attributes_storage_unittest.cc +++ b/chrome/browser/profiles/profile_attributes_storage_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/format_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/profiles/profile_avatar_downloader.h b/chrome/browser/profiles/profile_avatar_downloader.h index 43b3578..f2f086e 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.h +++ b/chrome/browser/profiles/profile_avatar_downloader.h @@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_AVATAR_DOWNLOADER_H_ #define CHROME_BROWSER_PROFILES_PROFILE_AVATAR_DOWNLOADER_H_ +#include <stddef.h> + #include "base/files/file_path.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc index 7839fbc..ccdcb59 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -6,6 +6,7 @@ #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/profiles/profile_avatar_icon_util.h b/chrome/browser/profiles/profile_avatar_icon_util.h index 99ca49b..f93cf56 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.h +++ b/chrome/browser/profiles/profile_avatar_icon_util.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_ #define CHROME_BROWSER_PROFILES_PROFILE_AVATAR_ICON_UTIL_H_ +#include <stddef.h> + #include <string> #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 72b1ee7..6b96f6b 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/profiles/profile.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" @@ -17,6 +19,7 @@ #include "base/synchronization/waitable_event.h" #include "base/values.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/net/url_request_mock_util.h" diff --git a/chrome/browser/profiles/profile_destroyer.cc b/chrome/browser/profiles/profile_destroyer.cc index 532b391..809703f 100644 --- a/chrome/browser/profiles/profile_destroyer.cc +++ b/chrome/browser/profiles/profile_destroyer.cc @@ -10,6 +10,7 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/render_process_host.h" @@ -18,9 +19,9 @@ namespace { #if defined(OS_ANDROID) // Set the render host waiting time to 5s on Android, that's the same // as an "Application Not Responding" timeout. -const int64 kTimerDelaySeconds = 5; +const int64_t kTimerDelaySeconds = 5; #else -const int64 kTimerDelaySeconds = 1; +const int64_t kTimerDelaySeconds = 1; #endif } // namespace diff --git a/chrome/browser/profiles/profile_destroyer.h b/chrome/browser/profiles/profile_destroyer.h index 59b705b..48f088b 100644 --- a/chrome/browser/profiles/profile_destroyer.h +++ b/chrome/browser/profiles/profile_destroyer.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_DESTROYER_H_ #define CHROME_BROWSER_PROFILES_PROFILE_DESTROYER_H_ +#include <stdint.h> + #include <set> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/timer/timer.h" #include "content/public/browser/render_process_host_observer.h" @@ -50,7 +53,7 @@ class ProfileDestroyer : public content::RenderProcessHostObserver { base::Timer timer_; // Used to count down the number of render process host left. - uint32 num_hosts_; + uint32_t num_hosts_; // The profile being destroyed. If it is set to NULL, it is a signal from // another instance of ProfileDestroyer that this instance is canceled. diff --git a/chrome/browser/profiles/profile_destroyer_unittest.cc b/chrome/browser/profiles/profile_destroyer_unittest.cc index 3a0b5fe..08b0545 100644 --- a/chrome/browser/profiles/profile_destroyer_unittest.cc +++ b/chrome/browser/profiles/profile_destroyer_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/profiles/profile_destroyer.h" +#include "base/macros.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc index 4eb0c33..8f0b246 100644 --- a/chrome/browser/profiles/profile_downloader.cc +++ b/chrome/browser/profiles/profile_downloader.cc @@ -4,6 +4,8 @@ #include "chrome/browser/profiles/profile_downloader.h" +#include <stddef.h> + #include <string> #include <vector> diff --git a/chrome/browser/profiles/profile_downloader.h b/chrome/browser/profiles/profile_downloader.h index ba18b5f..38241da 100644 --- a/chrome/browser/profiles/profile_downloader.h +++ b/chrome/browser/profiles/profile_downloader.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/image_decoder.h" diff --git a/chrome/browser/profiles/profile_downloader_delegate.h b/chrome/browser/profiles/profile_downloader_delegate.h index 70253e5..2b5dfe7 100644 --- a/chrome/browser/profiles/profile_downloader_delegate.h +++ b/chrome/browser/profiles/profile_downloader_delegate.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/strings/string16.h" class Profile; diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index f41d09b..35f64bc 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -4,6 +4,8 @@ #include "chrome/browser/profiles/profile_impl.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -28,6 +30,7 @@ #include "base/threading/thread_restrictions.h" #include "base/trace_event/trace_event.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background_sync/background_sync_controller_factory.h" #include "chrome/browser/background_sync/background_sync_controller_impl.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index b9791e6..33e581e 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -11,10 +11,12 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.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/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl_io_data.h" #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 6a68c08..05513e9 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/prefs/json_pref_store.h" @@ -21,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h index e8046fc..b924856 100644 --- a/chrome/browser/profiles/profile_impl_io_data.h +++ b/chrome/browser/profiles/profile_impl_io_data.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_ #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_store.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index 4c72069..a07b4ca 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" @@ -19,6 +20,7 @@ #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_avatar_downloader.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h index f61325b..a8137c8 100644 --- a/chrome/browser/profiles/profile_info_cache.h +++ b/chrome/browser/profiles/profile_info_cache.h @@ -5,15 +5,17 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_ #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/scoped_ptr_hash_map.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h" diff --git a/chrome/browser/profiles/profile_info_cache_observer.h b/chrome/browser/profiles/profile_info_cache_observer.h index 09573e5..6bb2896 100644 --- a/chrome/browser/profiles/profile_info_cache_observer.h +++ b/chrome/browser/profiles/profile_info_cache_observer.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_ #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/profiles/profile_info_cache_unittest.cc b/chrome/browser/profiles/profile_info_cache_unittest.cc index eb1aa44..2f3e9cd 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.cc +++ b/chrome/browser/profiles/profile_info_cache_unittest.cc @@ -4,14 +4,19 @@ #include "chrome/browser/profiles/profile_info_cache_unittest.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/prefs/testing_pref_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_avatar_downloader.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" @@ -125,7 +130,7 @@ TEST_F(ProfileInfoCacheTest, AddProfiles) { EXPECT_EQ(0u, GetCache()->GetNumberOfProfiles()); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - for (uint32 i = 0; i < 4; ++i) { + for (uint32_t i = 0; i < 4; ++i) { base::FilePath profile_path = GetProfilePath(base::StringPrintf("path_%ud", i)); base::string16 profile_name = @@ -158,7 +163,7 @@ TEST_F(ProfileInfoCacheTest, AddProfiles) { ResetCache(); EXPECT_EQ(4u, GetCache()->GetNumberOfProfiles()); - for (uint32 i = 0; i < 4; ++i) { + for (uint32_t i = 0; i < 4; ++i) { base::FilePath profile_path = GetProfilePath(base::StringPrintf("path_%ud", i)); EXPECT_EQ(i, GetCache()->GetIndexOfProfileWithPath(profile_path)); diff --git a/chrome/browser/profiles/profile_info_cache_unittest.h b/chrome/browser/profiles/profile_info_cache_unittest.h index 40e18f7..c052e4b 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.h +++ b/chrome/browser/profiles/profile_info_cache_unittest.h @@ -7,6 +7,7 @@ #include <set> +#include "base/macros.h" #include "base/test/scoped_path_override.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/test/base/testing_profile_manager.h" diff --git a/chrome/browser/profiles/profile_info_interface.h b/chrome/browser/profiles/profile_info_interface.h index 48a26e8..961060e 100644 --- a/chrome/browser/profiles/profile_info_interface.h +++ b/chrome/browser/profiles/profile_info_interface.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ #define CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ +#include <stddef.h> + #include "base/files/file_path.h" #include "base/strings/string16.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index d4f4c98..1f88159 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) { diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 20c7e77..6465852 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -5,18 +5,21 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.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/prefs/pref_member.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/devtools/devtools_network_controller_handle.h" #include "chrome/browser/io_thread.h" @@ -409,7 +412,7 @@ class ProfileIOData { net::URLRequestContext* GetRequestContext() override; scoped_ptr<net::ClientCertStore> CreateClientCertStore() override; void 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) diff --git a/chrome/browser/profiles/profile_list.h b/chrome/browser/profiles/profile_list.h index 7092d20..d76ca23 100644 --- a/chrome/browser/profiles/profile_list.h +++ b/chrome/browser/profiles/profile_list.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_LIST_H_ #define CHROME_BROWSER_PROFILES_PROFILE_LIST_H_ +#include <stddef.h> + #include "chrome/browser/profiles/avatar_menu.h" class ProfileInfoInterface; diff --git a/chrome/browser/profiles/profile_list_desktop.h b/chrome/browser/profiles/profile_list_desktop.h index ef9ca8e..9657461 100644 --- a/chrome/browser/profiles/profile_list_desktop.h +++ b/chrome/browser/profiles/profile_list_desktop.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_LIST_DESKTOP_H_ #define CHROME_BROWSER_PROFILES_PROFILE_LIST_DESKTOP_H_ -#include "chrome/browser/profiles/profile_list.h" +#include <stddef.h> #include <vector> +#include "base/macros.h" +#include "chrome/browser/profiles/profile_list.h" + class Browser; class ProfileInfoInterface; diff --git a/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chrome/browser/profiles/profile_list_desktop_browsertest.cc index f93aafc..33739e10 100644 --- a/chrome/browser/profiles/profile_list_desktop_browsertest.cc +++ b/chrome/browser/profiles/profile_list_desktop_browsertest.cc @@ -2,7 +2,11 @@ // 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 "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/avatar_menu.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc index 3ca1569..041473f 100644 --- a/chrome/browser/profiles/profile_list_desktop_unittest.cc +++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc @@ -7,10 +7,12 @@ #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/avatar_menu_observer.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profiles_state.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 716adf8..aaa2a34 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -4,6 +4,8 @@ #include "chrome/browser/profiles/profile_manager.h" +#include <stdint.h> + #include <set> #include "base/bind.h" @@ -20,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/startup_task_runner_service_factory.h" #include "chrome/browser/browser_process.h" @@ -129,9 +132,9 @@ std::vector<base::FilePath>& ProfilesToDelete() { return profiles_to_delete; } -int64 ComputeFilesSize(const base::FilePath& directory, - const base::FilePath::StringType& pattern) { - int64 running_size = 0; +int64_t ComputeFilesSize(const base::FilePath& directory, + const base::FilePath::StringType& pattern) { + int64_t running_size = 0; base::FileEnumerator iter(directory, false, base::FileEnumerator::FILES, pattern); while (!iter.Next().empty()) @@ -142,9 +145,9 @@ int64 ComputeFilesSize(const base::FilePath& directory, // Simple task to log the size of the current profile. void ProfileSizeTask(const base::FilePath& path, int enabled_app_count) { DCHECK_CURRENTLY_ON(BrowserThread::FILE); - const int64 kBytesInOneMB = 1024 * 1024; + const int64_t kBytesInOneMB = 1024 * 1024; - int64 size = ComputeFilesSize(path, FILE_PATH_LITERAL("*")); + int64_t size = ComputeFilesSize(path, FILE_PATH_LITERAL("*")); int size_MB = static_cast<int>(size / kBytesInOneMB); UMA_HISTOGRAM_COUNTS_10000("Profile.TotalSize", size_MB); diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index 6f84225..a9e0855 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -7,17 +7,20 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ +#include <stddef.h> + #include <list> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/non_thread_safe.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_shortcut_manager.h" #include "chrome/browser/ui/browser_list_observer.h" diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc index 8628bf0..e7020ed 100644 --- a/chrome/browser/profiles/profile_manager_browsertest.cc +++ b/chrome/browser/profiles/profile_manager_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/command_line.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/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 77e352d..0055243 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -2,11 +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 <string> #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/profiles/profile_metrics.cc b/chrome/browser/profiles/profile_metrics.cc index 1825c95..916036c 100644 --- a/chrome/browser/profiles/profile_metrics.cc +++ b/chrome/browser/profiles/profile_metrics.cc @@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/profile_metrics.h b/chrome/browser/profiles/profile_metrics.h index c34635f..9657bd9 100644 --- a/chrome/browser/profiles/profile_metrics.h +++ b/chrome/browser/profiles/profile_metrics.h @@ -8,8 +8,8 @@ #include <stddef.h> #include <string> -#include "base/basictypes.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/signin/core/browser/signin_header_helper.h" class Profile; diff --git a/chrome/browser/profiles/profile_metrics_mac.mm b/chrome/browser/profiles/profile_metrics_mac.mm index 8b12871..dd931b1 100644 --- a/chrome/browser/profiles/profile_metrics_mac.mm +++ b/chrome/browser/profiles/profile_metrics_mac.mm @@ -4,6 +4,9 @@ #include "chrome/browser/profiles/profile_metrics.h" +#include <stddef.h> +#include <stdint.h> + #include "base/numerics/safe_conversions.h" #include "chrome/browser/mac/keystone_glue.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager.h b/chrome/browser/profiles/profile_shortcut_manager.h index 68cc324..d6fdd3c 100644 --- a/chrome/browser/profiles/profile_shortcut_manager.h +++ b/chrome/browser/profiles/profile_shortcut_manager.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index 644a883..b891a61 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include <objbase.h> // For CoInitialize(). +#include <stddef.h> #include "base/base_paths.h" #include "base/files/file_util.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index 0061b4c..8877ed6 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profiles/profile_shortcut_manager_win.h" #include <shlobj.h> // For SHChangeNotify(). +#include <stddef.h> #include <string> #include <vector> @@ -13,6 +14,7 @@ #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h index 7645b8d..a7ed610 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.h +++ b/chrome/browser/profiles/profile_shortcut_manager_win.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_ #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile_shortcut_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/profiles/profile_statistics.cc b/chrome/browser/profiles/profile_statistics.cc index 961e4cc..df42397 100644 --- a/chrome/browser/profiles/profile_statistics.cc +++ b/chrome/browser/profiles/profile_statistics.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profiles/profile_statistics.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "base/task_runner.h" diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc index b9edb8a..10faa62 100644 --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc @@ -4,11 +4,15 @@ #include "chrome/browser/profiles/profile_window.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.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/profiles/profile_window.h b/chrome/browser/profiles/profile_window.h index 5c32eb2..0232662 100644 --- a/chrome/browser/profiles/profile_window.h +++ b/chrome/browser/profiles/profile_window.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ #include "base/callback_forward.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/profiles/profile_window_browsertest.cc b/chrome/browser/profiles/profile_window_browsertest.cc index 6d7ef46..7e212e6 100644 --- a/chrome/browser/profiles/profile_window_browsertest.cc +++ b/chrome/browser/profiles/profile_window_browsertest.cc @@ -4,8 +4,12 @@ #include "chrome/browser/profiles/profile_window.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.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" diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc index a225249..26c9dc5 100644 --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -4,10 +4,13 @@ #include "chrome/browser/profiles/profiles_state.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/prefs/pref_registry_simple.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/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.h b/chrome/browser/push_messaging/push_messaging_app_identifier.h index 542350d..5e8e1a7 100644 --- a/chrome/browser/push_messaging/push_messaging_app_identifier.h +++ b/chrome/browser/push_messaging/push_messaging_app_identifier.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_ +#include <stddef.h> #include <stdint.h> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/logging.h" #include "url/gurl.h" diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc b/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc index 4face03..6ca0cea 100644 --- a/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" +#include <stdint.h> + #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index e7a3708..caa8a8d 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc @@ -2,15 +2,20 @@ // 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 <map> #include <string> #include "base/barrier_closure.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" @@ -173,7 +178,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { } PushMessagingAppIdentifier GetAppIdentifierForServiceWorkerRegistration( - int64 service_worker_registration_id); + int64_t service_worker_registration_id); void SendMessageAndWaitUntilHandled( const PushMessagingAppIdentifier& app_identifier, @@ -263,7 +268,7 @@ void PushMessagingBrowserTest::TryToSubscribeSuccessfully( PushMessagingAppIdentifier PushMessagingBrowserTest::GetAppIdentifierForServiceWorkerRegistration( - int64 service_worker_registration_id) { + int64_t service_worker_registration_id) { GURL origin = https_server()->GetURL("/").GetOrigin(); PushMessagingAppIdentifier app_identifier = PushMessagingAppIdentifier::FindByServiceWorker( diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc index e5ec50a..bf7390a 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc @@ -4,6 +4,8 @@ #include "chrome/browser/push_messaging/push_messaging_notification_manager.h" +#include <stddef.h> + #include <bitset> #include "base/metrics/histogram_macros.h" diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.h b/chrome/browser/push_messaging/push_messaging_permission_context.h index 5ff4533..a23e259 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context.h +++ b/chrome/browser/push_messaging/push_messaging_permission_context.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/permissions/permission_context_base.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h index baa261f..f5b6e93 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h +++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_FACTORY_H_ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/browser/permissions/permission_context_factory_base.h" diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.h b/chrome/browser/push_messaging/push_messaging_service_factory.h index ded124e..27591f0 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.h +++ b/chrome/browser/push_messaging/push_messaging_service_factory.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_FACTORY_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/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc index 1436a08..4819ec7 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc @@ -14,6 +14,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_manager.h" @@ -240,7 +241,7 @@ void PushMessagingServiceImpl::OnMessage(const std::string& app_id, void PushMessagingServiceImpl::DeliverMessageCallback( const std::string& app_id, const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const gcm::IncomingMessage& message, const base::Closure& message_handled_closure, content::PushDeliveryStatus status) { @@ -340,7 +341,7 @@ GURL PushMessagingServiceImpl::GetPushEndpoint() { void PushMessagingServiceImpl::SubscribeFromDocument( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, int renderer_id, int render_frame_id, @@ -384,7 +385,7 @@ void PushMessagingServiceImpl::SubscribeFromDocument( void PushMessagingServiceImpl::SubscribeFromWorker( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, bool user_visible, const content::PushMessagingService::RegisterCallback& register_callback) { @@ -577,7 +578,7 @@ void PushMessagingServiceImpl::DidGetEncryptionInfo( void PushMessagingServiceImpl::Unsubscribe( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, const content::PushMessagingService::UnregisterCallback& callback) { PushMessagingAppIdentifier app_identifier = diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h index 6114583..e215ea4 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.h +++ b/chrome/browser/push_messaging/push_messaging_service_impl.h @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/background/background_trigger.h" @@ -128,7 +129,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService, void DeliverMessageCallback(const std::string& app_id, const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const gcm::IncomingMessage& message, const base::Closure& message_handled_closure, content::PushDeliveryStatus status); diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc index 52a7069..31446b9 100644 --- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc @@ -4,10 +4,13 @@ #include "content/public/browser/push_messaging_service.h" +#include <stdint.h> + #include <string> #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/permissions/permission_manager.h" diff --git a/chrome/browser/recovery/recovery_install_global_error.h b/chrome/browser/recovery/recovery_install_global_error.h index 3e97f56..2855f08 100644 --- a/chrome/browser/recovery/recovery_install_global_error.h +++ b/chrome/browser/recovery/recovery_install_global_error.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/global_error/global_error.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/recovery/recovery_install_global_error_factory.cc b/chrome/browser/recovery/recovery_install_global_error_factory.cc index 659e0c9..90b3e31 100644 --- a/chrome/browser/recovery/recovery_install_global_error_factory.cc +++ b/chrome/browser/recovery/recovery_install_global_error_factory.cc @@ -4,6 +4,7 @@ #include "chrome/browser/recovery/recovery_install_global_error_factory.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/recovery/recovery_install_global_error.h" diff --git a/chrome/browser/recovery/recovery_install_global_error_factory.h b/chrome/browser/recovery/recovery_install_global_error_factory.h index a4b7102..dbc4050 100644 --- a/chrome/browser/recovery/recovery_install_global_error_factory.h +++ b/chrome/browser/recovery/recovery_install_global_error_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RECOVERY_RECOVERY_INSTALL_GLOBAL_ERROR_FACTORY_H_ #define CHROME_BROWSER_RECOVERY_RECOVERY_INSTALL_GLOBAL_ERROR_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/renderer_context_menu/context_menu_content_type_app_mode.h b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h index 4a7d81f..27ca8d8 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_APP_MODE_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_APP_MODE_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypeAppMode : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h index 7f35b1d..5d765a2 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_EXTENSION_POPUP_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_EXTENSION_POPUP_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypeExtensionPopup : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h index d4401e2..990c03a 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_FACTORY_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_FACTORY_H_ +#include "base/macros.h" #include "content/public/common/context_menu_params.h" class ContextMenuContentType; diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h b/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h index 9718a18..8ce517c 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PANEL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PANEL_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypePanel : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h index 5f65b26..1dccf81 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PLATFORM_APP_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PLATFORM_APP_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" namespace extensions { diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index e832a03..aab6e15 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -4,6 +4,8 @@ #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <utility> @@ -11,6 +13,7 @@ #include "apps/app_load_service.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" @@ -18,6 +21,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h index df77e1f..f06d545 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 7c4f707..f3839a8 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc @@ -12,6 +12,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.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" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h index e2b5783..46b3548 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h index c0fc272..b038594 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_TEST_UTIL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_TEST_UTIL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "url/gurl.h" diff --git a/chrome/browser/renderer_context_menu/spelling_bubble_model.h b/chrome/browser/renderer_context_menu/spelling_bubble_model.h index 3aeafa8..e8905f8 100644 --- a/chrome/browser/renderer_context_menu/spelling_bubble_model.h +++ b/chrome/browser/renderer_context_menu/spelling_bubble_model.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_BUBBLE_MODEL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_BUBBLE_MODEL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/confirm_bubble_model.h" class Profile; diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h index adfead7..a98e7b5 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h @@ -5,9 +5,13 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_MENU_OBSERVER_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_MENU_OBSERVER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_member.h" #include "base/strings/string16.h" @@ -90,7 +94,7 @@ class SpellingMenuObserver : public RenderViewContextMenuObserver { // The hash identifier for the misspelled word. Used for collecting user // feedback to spellcheck suggestions. - uint32 misspelling_hash_; + uint32_t misspelling_hash_; // The string representing the result of this call. This string is a // suggestion when this call finished successfully. Otherwise it is error diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc index 8b7a446..5a68502 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc @@ -4,8 +4,11 @@ #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.cc b/chrome/browser/renderer_host/chrome_extension_message_filter.cc index a098713..921b225 100644 --- a/chrome/browser/renderer_host/chrome_extension_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_extension_message_filter.cc @@ -4,9 +4,12 @@ #include "chrome/browser/renderer_host/chrome_extension_message_filter.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.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" @@ -31,9 +34,8 @@ using content::BrowserThread; namespace { -const uint32 kFilteredMessageClasses[] = { - ChromeExtensionMsgStart, - ExtensionMsgStart, +const uint32_t kFilteredMessageClasses[] = { + ChromeExtensionMsgStart, ExtensionMsgStart, }; // Logs an action to the extension activity log for the specified profile. Can diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.h b/chrome/browser/renderer_host/chrome_extension_message_filter.h index 423339c..04762a9 100644 --- a/chrome/browser/renderer_host/chrome_extension_message_filter.h +++ b/chrome/browser/renderer_host/chrome_extension_message_filter.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc index d4ad767..056d6a8 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc @@ -4,11 +4,14 @@ #include "chrome/browser/renderer_host/chrome_render_message_filter.h" +#include <stdint.h> + #include <string> #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -40,10 +43,8 @@ using blink::WebCache; namespace { -const uint32 kFilteredMessageClasses[] = { - ChromeMsgStart, - ContentSettingsMsgStart, - NetworkHintsMsgStart, +const uint32_t kFilteredMessageClasses[] = { + ChromeMsgStart, ContentSettingsMsgStart, NetworkHintsMsgStart, }; } // namespace diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 249435b..64b46bd 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_message_filter.h" #include "third_party/WebKit/public/web/WebCache.h" diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm index 6025a7d..5b45c06 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index a8e6fa8..98e8f08 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -4,12 +4,15 @@ #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h" +#include <stdint.h> + #include <string> #include <vector> #include "base/base64.h" #include "base/guid.h" #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/component_updater/component_updater_resource_throttle.h" @@ -159,7 +162,7 @@ prerender::PrerenderManager* GetPrerenderManager(int render_process_id, void UpdatePrerenderNetworkBytesCallback(int render_process_id, int render_view_id, - int64 bytes) { + int64_t bytes) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); content::WebContents* web_contents = @@ -179,7 +182,7 @@ void UpdatePrerenderNetworkBytesCallback(int render_process_id, #if defined(ENABLE_EXTENSIONS) void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamInfo> stream, - int64 expected_content_size, + int64_t expected_content_size, int render_process_id, int render_frame_id, const std::string& extension_id, diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h index 0affd8b..345cd7f 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h @@ -9,6 +9,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "content/public/browser/resource_dispatcher_host_delegate.h" diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc index 081cd65..4d1d432 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_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/strings/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/cloud/policy_header_service_factory.h" diff --git a/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h b/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h index bfa8917..dfc79a1 100644 --- a/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h +++ b/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/ui_manager.h" diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc index 3ec5777..cdba6b6 100644 --- a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc +++ b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc @@ -5,8 +5,10 @@ #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #if defined(OS_CHROMEOS) @@ -145,7 +147,7 @@ void DeviceIDFetcher::ComputeOnUIThread(const std::string& salt, // Build the identifier as follows: // SHA256(machine-id||service||SHA256(machine-id||service||salt)) - std::vector<uint8> salt_bytes; + std::vector<uint8_t> salt_bytes; if (!base::HexStringToBytes(salt, &salt_bytes)) salt_bytes.clear(); if (salt_bytes.size() != kSaltLength) { diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.h b/chrome/browser/renderer_host/pepper/device_id_fetcher.h index 79001a2..7d9934a 100644 --- a/chrome/browser/renderer_host/pepper/device_id_fetcher.h +++ b/chrome/browser/renderer_host/pepper/device_id_fetcher.h @@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_DEVICE_ID_FETCHER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_DEVICE_ID_FETCHER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/c/pp_instance.h" diff --git a/chrome/browser/renderer_host/pepper/monitor_finder_mac.h b/chrome/browser/renderer_host/pepper/monitor_finder_mac.h index ea25a53..cc10ee8 100644 --- a/chrome/browser/renderer_host/pepper/monitor_finder_mac.h +++ b/chrome/browser/renderer_host/pepper/monitor_finder_mac.h @@ -6,7 +6,9 @@ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_ #include <ApplicationServices/ApplicationServices.h> +#include <stdint.h> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h index 44627c6..ead4371 100644 --- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h @@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/host/resource_message_filter.h" #include "url/gurl.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc index 7fbf70a..5ce6650 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc @@ -5,6 +5,7 @@ #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/content_settings/core/browser/cookie_settings.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h index 7c5fb7a..50308a2 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "ppapi/host/host_message_context.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index fdc054f..3c1c4c6 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -4,8 +4,11 @@ #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h" +#include <stddef.h> + #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" @@ -240,8 +243,8 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgReadData( base::string16 html; std::string url; - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; clipboard->ReadHTML(type, &html, &url, &fragment_start, &fragment_end); result = PP_OK; clipboard_string = base::UTF16ToUTF8( diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h index ff07eb7..4285dc2 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h @@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/host/resource_message_filter.h" #include "ppapi/shared_impl/flash_clipboard_format_registry.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc index 604b13a..a987001 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc @@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h index 902545f..faa83c9 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" #include "ppapi/host/host_message_context.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index 56ec5fd..a2d29f8 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -4,6 +4,9 @@ #include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h index a8ccb91..ffbc2d9 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_ +#include <stdint.h> + #include <set> #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h index 830d4a6..fe4865b 100644 --- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h @@ -5,7 +5,11 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_OUTPUT_PROTECTION_MESSAGE_FILTER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_OUTPUT_PROTECTION_MESSAGE_FILTER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "ppapi/c/pp_instance.h" #include "ppapi/host/resource_message_filter.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h index 42a5647..87644f0 100644 --- a/chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_PLATFORM_VERIFICATION_MESSAGE_FILTER_H_ #define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_PLATFORM_VERIFICATION_MESSAGE_FILTER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" #include "ppapi/c/pp_instance.h" #include "ppapi/host/resource_message_filter.h" diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc index 07ce6ce..97ea958 100644 --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc @@ -3,9 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/process/process.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/search/search.h" diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h index 43a7957..b3a0776 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h +++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index 89b7d77..a6498fc 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -6,6 +6,7 @@ #include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/host_zoom_map.h" diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h index 23779c6..1510955 100644 --- a/chrome/browser/repost_form_warning_controller.h +++ b/chrome/browser/repost_form_warning_controller.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_REPOST_FORM_WARNING_CONTROLLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index 5d78f77..0f14d51 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -4,10 +4,13 @@ #include "chrome/browser/resources_util.h" +#include <stddef.h> + #include <utility> #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" +#include "build/build_config.h" #include "grit/components_scaled_resources_map.h" #include "grit/theme_resources_map.h" #include "grit/ui_resources_map.h" diff --git a/chrome/browser/resources_util.h b/chrome/browser/resources_util.h index 5b7acec..c52add2 100644 --- a/chrome/browser/resources_util.h +++ b/chrome/browser/resources_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" class ResourcesUtil { public: @@ -16,6 +16,7 @@ class ResourcesUtil { private: ResourcesUtil() {} + DISALLOW_COPY_AND_ASSIGN(ResourcesUtil); }; diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc index e937aa8..123b579 100644 --- a/chrome/browser/resources_util_unittest.cc +++ b/chrome/browser/resources_util_unittest.cc @@ -4,6 +4,10 @@ #include "chrome/browser/resources_util.h" +#include <stddef.h> + +#include "base/macros.h" +#include "build/build_config.h" #include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/resources/grit/ui_resources.h" diff --git a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc index 96fc944..5d5a030 100644 --- a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc +++ b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/google/google_brand.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 29b4d4a..cd1018d 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/browser_feature_extractor.h" +#include <stddef.h> + #include <map> #include <utility> diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h index 21aa10c..85756c3 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.h +++ b/chrome/browser/safe_browsing/browser_feature_extractor.h @@ -16,9 +16,9 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index 612156f..840f858 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index de55e54..b5e35df 100644 --- a/chrome/browser/safe_browsing/chunk_range.cc +++ b/chrome/browser/safe_browsing/chunk_range.cc @@ -4,6 +4,8 @@ // // Implementation of ChunkRange class. +#include <stddef.h> + #include <algorithm> #include "chrome/browser/safe_browsing/chunk_range.h" diff --git a/chrome/browser/safe_browsing/chunk_range_unittest.cc b/chrome/browser/safe_browsing/chunk_range_unittest.cc index 6990e73..d93e068 100644 --- a/chrome/browser/safe_browsing/chunk_range_unittest.cc +++ b/chrome/browser/safe_browsing/chunk_range_unittest.cc @@ -6,6 +6,8 @@ #include "chrome/browser/safe_browsing/chunk_range.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 5e5476b..55b1b95 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h index ab26a38..eb260b3 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.h +++ b/chrome/browser/safe_browsing/client_side_detection_host.h @@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_ #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_ +#include <stddef.h> + #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 "chrome/browser/safe_browsing/browser_feature_extractor.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 1352715..ab8c09d 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h index bc1ddfe..1e168a6 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.h +++ b/chrome/browser/safe_browsing/client_side_detection_service.h @@ -20,9 +20,9 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 59411cc..73762aa 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <map> #include <queue> #include <string> @@ -9,6 +11,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" @@ -42,7 +45,7 @@ class MockModelLoader : public ModelLoader { : ModelLoader(base::Closure(), model_name) {} ~MockModelLoader() override {} - MOCK_METHOD1(ScheduleFetch, void(int64)); + MOCK_METHOD1(ScheduleFetch, void(int64_t)); MOCK_METHOD0(CancelFetcher, void()); private: diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc index 16c0f62..81a2d87 100644 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc @@ -187,7 +187,7 @@ void ModelLoader::EndFetch(ClientModelStatus status, base::TimeDelta max_age) { ScheduleFetch(delay_ms); } -void ModelLoader::ScheduleFetch(int64 delay_ms) { +void ModelLoader::ScheduleFetch(int64_t delay_ms) { if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSbDisableAutoUpdate)) return; diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h index d532e84..aa8f1b7 100644 --- a/chrome/browser/safe_browsing/client_side_model_loader.h +++ b/chrome/browser/safe_browsing/client_side_model_loader.h @@ -11,11 +11,14 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_MODEL_LOADER_H_ #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_MODEL_LOADER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -56,7 +59,7 @@ class ModelLoader : public net::URLFetcherDelegate { void OnURLFetchComplete(const net::URLFetcher* source) override; // Schedules the next fetch of the model. - virtual void ScheduleFetch(int64 delay_ms); + virtual void ScheduleFetch(int64_t delay_ms); // Cancel any pending model fetch. virtual void CancelFetcher(); diff --git a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc b/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc index 4679b82..423e3c0 100644 --- a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader_unittest.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 <stdint.h> + #include <map> #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" @@ -38,7 +41,7 @@ class MockModelLoader : public ModelLoader { : ModelLoader(update_renderers_callback, model_name) {} ~MockModelLoader() override {} - MOCK_METHOD1(ScheduleFetch, void(int64)); + MOCK_METHOD1(ScheduleFetch, void(int64_t)); MOCK_METHOD2(EndFetch, void(ClientModelStatus, base::TimeDelta)); private: diff --git a/chrome/browser/safe_browsing/download_feedback.cc b/chrome/browser/safe_browsing/download_feedback.cc index 27f4008..e792d41 100644 --- a/chrome/browser/safe_browsing/download_feedback.cc +++ b/chrome/browser/safe_browsing/download_feedback.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/files/file_util_proxy.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/task_runner.h" #include "chrome/common/safe_browsing/csd.pb.h" @@ -64,7 +65,7 @@ class DownloadFeedbackImpl : public DownloadFeedback { scoped_refptr<net::URLRequestContextGetter> request_context_getter_; scoped_refptr<base::TaskRunner> file_task_runner_; const base::FilePath file_path_; - int64 file_size_; + int64_t file_size_; // The safebrowsing request and response of checking that this binary is // unsafe. @@ -192,7 +193,7 @@ void DownloadFeedbackImpl::RecordUploadResult(UploadResultType result) { } // namespace // static -const int64 DownloadFeedback::kMaxUploadSize = 50 * 1024 * 1024; +const int64_t DownloadFeedback::kMaxUploadSize = 50 * 1024 * 1024; // static const char DownloadFeedback::kSbFeedbackURL[] = diff --git a/chrome/browser/safe_browsing/download_feedback.h b/chrome/browser/safe_browsing/download_feedback.h index 6473bda..28fe064 100644 --- a/chrome/browser/safe_browsing/download_feedback.h +++ b/chrome/browser/safe_browsing/download_feedback.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_FEEDBACK_H_ #define CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_FEEDBACK_H_ +#include <stdint.h> + #include <string> #include "base/callback_forward.h" @@ -37,7 +39,7 @@ class DownloadFeedback : public base::NonThreadSafe { // The largest file size we support uploading. // Note: changing this will affect the max size of // SBDownloadFeedback.SizeSuccess and SizeFailure histograms. - static const int64 kMaxUploadSize; + static const int64_t kMaxUploadSize; // The URL where the browser sends download feedback requests. static const char kSbFeedbackURL[]; diff --git a/chrome/browser/safe_browsing/download_feedback_service.h b/chrome/browser/safe_browsing/download_feedback_service.h index d1ef35c..665c685 100644 --- a/chrome/browser/safe_browsing/download_feedback_service.h +++ b/chrome/browser/safe_browsing/download_feedback_service.h @@ -8,7 +8,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/threading/non_thread_safe.h" diff --git a/chrome/browser/safe_browsing/download_feedback_service_unittest.cc b/chrome/browser/safe_browsing/download_feedback_service_unittest.cc index 2eb5b04..a932dbf 100644 --- a/chrome/browser/safe_browsing/download_feedback_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_feedback_service_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/download_feedback_service.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/files/file_util.h" @@ -115,7 +118,7 @@ class FakeDownloadFeedbackFactory : public DownloadFeedbackFactory { }; bool WillStorePings(DownloadProtectionService::DownloadCheckResult result, - int64 size) { + int64_t size) { content::MockDownloadItem item; EXPECT_CALL(item, GetReceivedBytes()).WillRepeatedly(Return(size)); @@ -172,8 +175,8 @@ class DownloadFeedbackServiceTest : public testing::Test { }; TEST_F(DownloadFeedbackServiceTest, MaybeStorePingsForDownload) { - const int64 ok_size = DownloadFeedback::kMaxUploadSize; - const int64 bad_size = DownloadFeedback::kMaxUploadSize + 1; + const int64_t ok_size = DownloadFeedback::kMaxUploadSize; + const int64_t bad_size = DownloadFeedback::kMaxUploadSize + 1; EXPECT_FALSE(WillStorePings(DownloadProtectionService::SAFE, ok_size)); EXPECT_FALSE(WillStorePings(DownloadProtectionService::DANGEROUS, ok_size)); diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index b667456..6c0d349 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -4,10 +4,13 @@ #include "chrome/browser/safe_browsing/download_protection_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h" @@ -23,6 +26,7 @@ #include "base/task/cancelable_task_tracker.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/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -63,7 +67,7 @@ using content::BrowserThread; namespace { -static const int64 kDownloadRequestTimeoutMs = 7000; +static const int64_t kDownloadRequestTimeoutMs = 7000; } // namespace namespace safe_browsing { @@ -1061,7 +1065,7 @@ void DownloadProtectionService::ParseManualBlacklistFlag() { command_line->GetSwitchValueASCII(switches::kSbManualDownloadBlacklist); for (const std::string& hash_hex : base::SplitString( flag_val, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { - std::vector<uint8> bytes; + std::vector<uint8_t> bytes; if (base::HexStringToBytes(hash_hex, &bytes) && bytes.size() == 32) { manual_blacklist_hashes_.insert( std::string(bytes.begin(), bytes.end())); diff --git a/chrome/browser/safe_browsing/download_protection_service.h b/chrome/browser/safe_browsing/download_protection_service.h index d1c7310..ea21626 100644 --- a/chrome/browser/safe_browsing/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection_service.h @@ -8,15 +8,17 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_ #define CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_ +#include <stdint.h> + #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/callback_list.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/database_manager.h" @@ -125,7 +127,7 @@ class DownloadProtectionService { } // Returns the timeout that is used by CheckClientDownload(). - int64 download_request_timeout_ms() const { + int64_t download_request_timeout_ms() const { return download_request_timeout_ms_; } @@ -235,7 +237,7 @@ class DownloadProtectionService { // BinaryFeatureExtractor object, may be overridden for testing. scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor_; - int64 download_request_timeout_ms_; + int64_t download_request_timeout_ms_; scoped_ptr<DownloadFeedbackService> feedback_service_; diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index e4116d0..23c0b9a 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/safe_browsing/download_protection_service.h" +#include <stddef.h> #include <stdint.h> #include <map> #include <string> @@ -15,6 +16,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/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -1908,7 +1910,7 @@ class DownloadProtectionServiceFlagTest : public DownloadProtectionServiceTest { : blacklisted_hash_hex_("1e954d9ce0389e2ba7447216f21761f98d1e6540c2abecdbecff570e36c493db") {} void SetUp() override { - std::vector<uint8> bytes; + std::vector<uint8_t> bytes; ASSERT_TRUE(base::HexStringToBytes(blacklisted_hash_hex_, &bytes) && bytes.size() == 32); blacklisted_hash_ = std::string(bytes.begin(), bytes.end()); diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc index 1768187..626c48c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc @@ -14,6 +14,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h" #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h index 0d1efe7..e428537 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_ +#include <stddef.h> + #include <string> #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.cc index b6da848..a6ad5f1 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.h" +#include <stddef.h> + #include "base/files/file_util.h" #include "base/mac/bundle_locations.h" #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc index 8d3c00a..a776e19 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac.h" +#include <stdint.h> + #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc index 54148e3..952981f 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc @@ -4,9 +4,12 @@ #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.h" +#include <stddef.h> + #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 "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h" #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h index d30ab41..809e7c0 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_INCIDENT_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_INCIDENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc index 7dedefa..bbb978e 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.cc b/chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.cc index 0bfe254..4891e77 100644 --- a/chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.cc +++ b/chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.cc @@ -4,6 +4,7 @@ #include "chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/blacklist_load_incident.h b/chrome/browser/safe_browsing/incident_reporting/blacklist_load_incident.h index 69cc127..d983905 100644 --- a/chrome/browser/safe_browsing/incident_reporting/blacklist_load_incident.h +++ b/chrome/browser/safe_browsing/incident_reporting/blacklist_load_incident.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BLACKLIST_LOAD_INCIDENT_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BLACKLIST_LOAD_INCIDENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc index 1f2b6b2..b7e7ba7 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h" +#include <stdint.h> + #include <list> #include "base/bind.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc index 7ac1855..0bd6e03 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h" +#include <stdint.h> + #include <string> #include "base/bind.h" @@ -42,7 +44,7 @@ namespace { const uint32_t kTestDownloadId = 47; const uint32_t kOtherDownloadId = 48; const uint32_t kCrazyDowloadId = 655; -const int64 kTestDownloadTimeMsec = 84; +const int64_t kTestDownloadTimeMsec = 84; const char kTestUrl[] = "http://test.test/foo"; const uint64_t kTestDownloadLength = 1000; const double kTestDownloadEndTimeMs = 1413514824057; diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc index 36bfe31..0d0b7d3 100644 --- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc +++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc @@ -12,6 +12,7 @@ #include "base/sys_info.h" #include "base/threading/platform_thread.h" #include "base/threading/sequenced_worker_pool.h" +#include "build/build_config.h" #include "chrome/common/channel_info.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "components/version_info/version_info.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc index 0d2b881..829fd6d 100644 --- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc +++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc @@ -4,10 +4,13 @@ #include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h" +#include <stdint.h> + #include <set> #include <string> #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string16.h" @@ -92,7 +95,7 @@ void CollectRegistryDataForKey( std::vector<wchar_t> name_buffer(max_name_len); // Read the values. if (num_values != 0) { - std::vector<uint8> value_buffer(max_value_len != 0 ? max_value_len : 1); + std::vector<uint8_t> value_buffer(max_value_len != 0 ? max_value_len : 1); DWORD name_size = 0; DWORD value_type = REG_NONE; DWORD value_size = 0; diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h index 4469467..dd11239c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h +++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_WIN_H_ #include <windows.h> +#include <stddef.h> namespace google { namespace protobuf { diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc index 05c5f53..d429dac 100644 --- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> diff --git a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc index 4de21e2..1560227 100644 --- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/install_signer.h" #include "chrome/browser/extensions/test_extension_system.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc index 5f9ebab..82e9d5c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc @@ -5,10 +5,12 @@ #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h" #include <math.h> +#include <stddef.h> #include <algorithm> #include <vector> +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" @@ -18,6 +20,7 @@ #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile.h" @@ -67,10 +70,10 @@ struct PersistentIncidentState { }; // The amount of time the service will wait to collate incidents. -const int64 kDefaultUploadDelayMs = 1000 * 60; // one minute +const int64_t kDefaultUploadDelayMs = 1000 * 60; // one minute // The amount of time between running delayed analysis callbacks. -const int64 kDefaultCallbackIntervalMs = 1000 * 20; +const int64_t kDefaultCallbackIntervalMs = 1000 * 20; // Logs the type of incident in |incident_data| to a user metrics histogram. void LogIncidentDataType(IncidentDisposition disposition, diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc index 99fdd29..cc773da 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc @@ -4,12 +4,15 @@ #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h" +#include <stdint.h> + #include <map> #include <string> #include "base/bind.h" #include "base/callback.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -17,6 +20,7 @@ #include "base/test/test_simple_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread_local.h" +#include "build/build_config.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc index cb7639b..d82c123 100644 --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc +++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <functional> #include <utility> @@ -13,6 +16,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/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/history/history_service_factory.h" @@ -38,12 +42,12 @@ namespace { // functions that follow. // Returns the end time of a download represented by a DownloadRow. -int64 GetEndTime(const history::DownloadRow& row) { +int64_t GetEndTime(const history::DownloadRow& row) { return row.end_time.ToJavaTime(); } // Returns the end time of a download represented by a DownloadDetails. -int64 GetEndTime(const ClientIncidentReport_DownloadDetails& details) { +int64_t GetEndTime(const ClientIncidentReport_DownloadDetails& details) { return details.download_time_msec(); } diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc index 845a3d7..27a2f9c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h" +#include <stddef.h> + #include <string> #include <vector> @@ -20,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/mock_entropy_provider.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/chrome_history_client.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h index d05183d..d8f69b1 100644 --- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h +++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_ +#include <stddef.h> + namespace safe_browsing { // The test dlls used by module_integrity_verifier_win_unittest.cc and diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc index 55ea230..7bc3d33 100644 --- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc +++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc @@ -4,12 +4,15 @@ #include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "base/metrics/sparse_histogram.h" #include "base/scoped_native_library.h" #include "base/strings/utf_string_conversions.h" @@ -325,7 +328,7 @@ bool VerifyModule( if (!mapped_module.Initialize(base::FilePath(module_path))) return false; ModuleVerificationState state( - reinterpret_cast<HMODULE>(const_cast<uint8*>(mapped_module.data()))); + reinterpret_cast<HMODULE>(const_cast<uint8_t*>(mapped_module.data()))); base::win::PEImage mem_peimage(module_handle); if (!mem_peimage.VerifyMagic() || !state.disk_peimage.VerifyMagic()) diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc index 62b74db..bf1dd14 100644 --- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <functional> #include <map> @@ -11,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "base/native_library.h" #include "base/scoped_native_library.h" #include "base/strings/utf_string_conversions.h" @@ -111,8 +115,8 @@ class SafeBrowsingModuleVerifierWinTest : public testing::Test { } void GetDiskModuleHandle(HMODULE* disk_handle) { - *disk_handle = - reinterpret_cast<HMODULE>(const_cast<uint8*>(disk_dll_handle_.data())); + *disk_handle = reinterpret_cast<HMODULE>( + const_cast<uint8_t*>(disk_dll_handle_.data())); } // Returns the address of the named function exported by the test dll. diff --git a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc index c352b19..1a19216 100644 --- a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc +++ b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.cc index 3c3ad7d9..3112d03 100644 --- a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc index 03eef13..1aa21ef 100644 --- a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc @@ -6,6 +6,8 @@ #if defined(USE_PLATFORM_STATE_STORE) +#include <stdint.h> + #include "base/json/json_reader.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc index bf00f7d..054bf5c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h" +#include "base/macros.h" #include "base/prefs/pref_notifier_impl.h" #include "base/prefs/testing_pref_store.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc index cd2ec7d..7fefdb2 100644 --- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h" +#include <stddef.h> + #include <string> #include <vector> diff --git a/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h b/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h index a7055c6..2a60250 100644 --- a/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h +++ b/chrome/browser/safe_browsing/incident_reporting/resource_request_incident.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_RESOURCE_REQUEST_INCIDENT_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_RESOURCE_REQUEST_INCIDENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store.h b/chrome/browser/safe_browsing/incident_reporting/state_store.h index e361ee4..b5cb996 100644 --- a/chrome/browser/safe_browsing/incident_reporting/state_store.h +++ b/chrome/browser/safe_browsing/incident_reporting/state_store.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_STATE_STORE_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_STATE_STORE_H_ +#include <stdint.h> + #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc index 25774ff..848b950 100644 --- a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/incident_reporting/state_store.h" +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/macros.h" @@ -12,6 +14,7 @@ #include "base/test/test_simple_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h index 6b979fe..6b2ac93 100644 --- a/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h +++ b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_TRACKED_PREFERENCE_INCIDENT_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_TRACKED_PREFERENCE_INCIDENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" diff --git a/chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_incident.h b/chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_incident.h index 3f8d008..f00f70f 100644 --- a/chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_incident.h +++ b/chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_incident.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_VARIATIONS_SEED_SIGNATURE_INCIDENT_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_VARIATIONS_SEED_SIGNATURE_INCIDENT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" diff --git a/chrome/browser/safe_browsing/local_database_manager.h b/chrome/browser/safe_browsing/local_database_manager.h index 3028346..0a0e465 100644 --- a/chrome/browser/safe_browsing/local_database_manager.h +++ b/chrome/browser/safe_browsing/local_database_manager.h @@ -8,6 +8,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_ #define CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_ +#include <stddef.h> + #include <deque> #include <map> #include <set> @@ -17,6 +19,7 @@ #include "base/callback.h" #include "base/containers/hash_tables.h" #include "base/gtest_prod_util.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/safe_browsing/local_database_manager_unittest.cc b/chrome/browser/safe_browsing/local_database_manager_unittest.cc index 8b58e60..e4d6861 100644 --- a/chrome/browser/safe_browsing/local_database_manager_unittest.cc +++ b/chrome/browser/safe_browsing/local_database_manager_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 <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h index 2d22647..5433d12 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_LOCAL_SAFEBROWSING_TEST_SERVER_H_ #define CHROME_BROWSER_SAFE_BROWSING_LOCAL_SAFEBROWSING_TEST_SERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "net/test/spawned_test_server/local_test_server.h" namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.h b/chrome/browser/safe_browsing/local_two_phase_testserver.h index 6d0223f..0bb5b97 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.h +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_LOCAL_TWO_PHASE_TESTSERVER_H_ #define CHROME_BROWSER_SAFE_BROWSING_LOCAL_TWO_PHASE_TESTSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "net/test/spawned_test_server/local_test_server.h" namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/ping_manager.h b/chrome/browser/safe_browsing/ping_manager.h index 6112f6e..7247869 100644 --- a/chrome/browser/safe_browsing/ping_manager.h +++ b/chrome/browser/safe_browsing/ping_manager.h @@ -12,6 +12,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/hit_report.h" #include "chrome/browser/safe_browsing/protocol_manager_helper.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index e746763..350fbf4 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -6,6 +6,7 @@ #include "base/environment.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/profiler/scoped_tracker.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 1d33c52..8883566 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -18,8 +18,11 @@ #include <string> #include <vector> +#include <stddef.h> + #include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" diff --git a/chrome/browser/safe_browsing/protocol_manager_helper.h b/chrome/browser/safe_browsing/protocol_manager_helper.h index 550bf91..0962536 100644 --- a/chrome/browser/safe_browsing/protocol_manager_helper.h +++ b/chrome/browser/safe_browsing/protocol_manager_helper.h @@ -10,6 +10,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc index 8f44267..fb24ffb 100644 --- a/chrome/browser/safe_browsing/protocol_parser.cc +++ b/chrome/browser/safe_browsing/protocol_parser.cc @@ -6,10 +6,12 @@ // TODOv3(shess): Review these changes carefully. +#include <stdint.h> #include <stdlib.h> #include "base/format_macros.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" @@ -72,8 +74,8 @@ class BufferReader { return true; } - // Read a 32-bit integer in network byte order into a local uint32. - bool GetNet32(uint32* i) { + // Read a 32-bit integer in network byte order into a local uint32_t. + bool GetNet32(uint32_t* i) { if (!GetData(i, sizeof(*i))) return false; @@ -354,7 +356,7 @@ bool ParseChunk(const char* data, BufferReader reader(data, length); while (!reader.empty()) { - uint32 l = 0; + uint32_t l = 0; if (!reader.GetNet32(&l) || l == 0 || l > reader.length()) return false; diff --git a/chrome/browser/safe_browsing/protocol_parser.h b/chrome/browser/safe_browsing/protocol_parser.h index 9509734..59078bf 100644 --- a/chrome/browser/safe_browsing/protocol_parser.h +++ b/chrome/browser/safe_browsing/protocol_parser.h @@ -10,10 +10,11 @@ // // The quoted references are with respect to that document. +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" namespace base { diff --git a/chrome/browser/safe_browsing/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc index 3258650..069a283 100644 --- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc +++ b/chrome/browser/safe_browsing/protocol_parser_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 <string> #include <vector> diff --git a/chrome/browser/safe_browsing/remote_database_manager.h b/chrome/browser/safe_browsing/remote_database_manager.h index c3c5de8..1cc8f7d 100644 --- a/chrome/browser/safe_browsing/remote_database_manager.h +++ b/chrome/browser/safe_browsing/remote_database_manager.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 "chrome/browser/safe_browsing/database_manager.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_api_handler_util.cc b/chrome/browser/safe_browsing/safe_browsing_api_handler_util.cc index 899b83f..897ad40 100644 --- a/chrome/browser/safe_browsing/safe_browsing_api_handler_util.cc +++ b/chrome/browser/safe_browsing/safe_browsing_api_handler_util.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_api_handler_util.h" +#include <stddef.h> + #include <string> #include "base/json/json_reader.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index a4d2f7e..333f9fff 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -12,6 +12,7 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" @@ -80,7 +81,7 @@ const char kSocialEngineeringEnabled[] = "Enabled"; // but clicked "proceed anyway", we delay the call to // ThreatDetails::FinishCollection() by this much time (in // milliseconds). -const int64 kMalwareDetailsProceedDelayMilliSeconds = 3000; +const int64_t kMalwareDetailsProceedDelayMilliSeconds = 3000; // Constants for the Experience Sampling instrumentation. const char kEventNameMalware[] = "safebrowsing_interstitial_"; @@ -444,7 +445,7 @@ void SafeBrowsingBlockingPage::OnDontProceed() { } } -void SafeBrowsingBlockingPage::FinishThreatDetails(int64 delay_ms, +void SafeBrowsingBlockingPage::FinishThreatDetails(int64_t delay_ms, bool did_proceed, int num_visits) { if (threat_details_.get() == NULL) diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h index daf431c..7c76963 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h @@ -32,7 +32,10 @@ #include <string> #include <vector> +#include <stdint.h> + #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/interstitials/chrome_metrics_helper.h" #include "chrome/browser/interstitials/security_interstitial_page.h" @@ -133,7 +136,7 @@ class SafeBrowsingBlockingPage : public SecurityInterstitialPage { // report but clicked "proceed anyway", we delay the call to // ThreatDetails::FinishCollection() by this much time (in // milliseconds), in order to get data from the blocked resource itself. - int64 malware_details_proceed_delay_ms_; + int64_t malware_details_proceed_delay_ms_; FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, MalwareReportsTransitionDisabled); @@ -148,7 +151,7 @@ class SafeBrowsingBlockingPage : public SecurityInterstitialPage { // pending threat details object, we look at the user's // preferences, and if the option to send threat details is // enabled, the report is scheduled to be sent on the |ui_manager_|. - void FinishThreatDetails(int64 delay_ms, bool did_proceed, int num_visits); + void FinishThreatDetails(int64_t delay_ms, bool did_proceed, int num_visits); // A list of SafeBrowsingUIManager::UnsafeResource for a tab that the user // should be warned about. They are queued when displaying more than one diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index c680949..893c549 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -10,11 +10,13 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/histogram_tester.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" #include "chrome/browser/net/url_request_mock_util.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index d3d95f9..06b53c9 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/safe_browsing_database.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <iterator> @@ -19,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" #include "components/safe_browsing_db/prefix_set.h" #include "content/public/browser/browser_thread.h" @@ -216,8 +220,8 @@ void UpdateChunkRangesForList( // This code always checks for non-zero file size. This helper makes // that less verbose. -int64 GetFileSizeOrZero(const base::FilePath& file_path) { - int64 size_64; +int64_t GetFileSizeOrZero(const base::FilePath& file_path) { + int64_t size_64; if (!base::GetFileSize(file_path, &size_64)) return 0; return size_64; @@ -1663,9 +1667,9 @@ void SafeBrowsingDatabaseNew::LoadIpBlacklist( const char* full_hash = it->full_hash.full_hash; DCHECK_EQ(crypto::kSHA256Length, arraysize(it->full_hash.full_hash)); // The format of the IP blacklist is: - // SHA-1(IPv6 prefix) + uint8(prefix size) + 11 unused bytes. + // SHA-1(IPv6 prefix) + uint8_t(prefix size) + 11 unused bytes. std::string hashed_ip_prefix(full_hash, base::kSHA1Length); - size_t prefix_size = static_cast<uint8>(full_hash[base::kSHA1Length]); + size_t prefix_size = static_cast<uint8_t>(full_hash[base::kSHA1Length]); if (prefix_size > kMaxIpPrefixSize || prefix_size < kMinIpPrefixSize) { RecordFailure(FAILURE_IP_BLACKLIST_UPDATE_INVALID); new_blacklist.clear(); // Load empty blacklist. @@ -1712,7 +1716,7 @@ SafeBrowsingDatabaseNew::GetUnsynchronizedPrefixGetHashCacheForTesting() { void SafeBrowsingDatabaseNew::RecordFileSizeHistogram( const base::FilePath& file_path) { - const int64 file_size = GetFileSizeOrZero(file_path); + const int64_t file_size = GetFileSizeOrZero(file_path); const int file_size_kilobytes = static_cast<int>(file_size / 1024); base::FilePath::StringType filename = file_path.BaseName().value(); diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index 17c7b8f..c7f6599 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -13,6 +13,7 @@ #include "base/containers/hash_tables.h" #include "base/files/file_path.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/sequenced_task_runner.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index 7264c9f..f010d59 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -6,6 +6,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_database.h" +#include <stddef.h> + #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 0f32155b..ecaec7b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/prefs/pref_change_registrar.h" @@ -19,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 8ab5831..324d435 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -14,6 +14,7 @@ #include "base/callback.h" #include "base/callback_list.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/observer_list.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 6c9168e..3b5e446 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -12,6 +12,7 @@ #include "base/command_line.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/metrics/field_trial.h" #include "base/path_service.h" @@ -21,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/thread_test_helper.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/startup_task_runner_service_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store.cc b/chrome/browser/safe_browsing/safe_browsing_store.cc index 326530b..29357a1 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store.cc @@ -73,7 +73,7 @@ void KnockoutSubs(SubsT* subs, AddsT* adds, // Remove deleted items (|chunk_id| in |del_set|) from the container. template <typename ItemsT> -void RemoveDeleted(ItemsT* items, const base::hash_set<int32>& del_set) { +void RemoveDeleted(ItemsT* items, const base::hash_set<int32_t>& del_set) { DCHECK(items); // Move items from |iter| to |end_iter|, skipping items in |del_set|. @@ -96,8 +96,8 @@ void SBProcessSubs(SBAddPrefixes* add_prefixes, SBSubPrefixes* sub_prefixes, std::vector<SBAddFullHash>* add_full_hashes, std::vector<SBSubFullHash>* sub_full_hashes, - const base::hash_set<int32>& add_chunks_deleted, - const base::hash_set<int32>& sub_chunks_deleted) { + const base::hash_set<int32_t>& add_chunks_deleted, + const base::hash_set<int32_t>& sub_chunks_deleted) { // It is possible to structure templates and template // specializations such that the following calls work without having // to qualify things. It becomes very arbitrary, though, and less diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index 83b0d8f..fe68a92 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -5,13 +5,15 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_H_ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_H_ +#include <stdint.h> + #include <deque> #include <set> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" @@ -47,13 +49,13 @@ class PrefixSetBuilder; // SBAddPrefixLess() and SBAddPrefixHashLess(). struct SBAddPrefix { - int32 chunk_id; + int32_t chunk_id; SBPrefix prefix; - SBAddPrefix(int32 id, SBPrefix p) : chunk_id(id), prefix(p) {} + SBAddPrefix(int32_t id, SBPrefix p) : chunk_id(id), prefix(p) {} SBAddPrefix() : chunk_id(), prefix() {} - int32 GetAddChunkId() const { return chunk_id; } + int32_t GetAddChunkId() const { return chunk_id; } SBPrefix GetAddPrefix() const { return prefix; } }; @@ -62,46 +64,46 @@ struct SBAddPrefix { typedef std::deque<SBAddPrefix> SBAddPrefixes; struct SBSubPrefix { - int32 chunk_id; - int32 add_chunk_id; + int32_t chunk_id; + int32_t add_chunk_id; SBPrefix add_prefix; - SBSubPrefix(int32 id, int32 add_id, SBPrefix prefix) + SBSubPrefix(int32_t id, int32_t add_id, SBPrefix prefix) : chunk_id(id), add_chunk_id(add_id), add_prefix(prefix) {} SBSubPrefix() : chunk_id(), add_chunk_id(), add_prefix() {} - int32 GetAddChunkId() const { return add_chunk_id; } + int32_t GetAddChunkId() const { return add_chunk_id; } SBPrefix GetAddPrefix() const { return add_prefix; } }; typedef std::deque<SBSubPrefix> SBSubPrefixes; struct SBAddFullHash { - int32 chunk_id; + int32_t chunk_id; // Received field is not used anymore, but is kept for DB compatability. // TODO(shess): Deprecate and remove. - int32 deprecated_received; + int32_t deprecated_received; SBFullHash full_hash; - SBAddFullHash(int32 id, const SBFullHash& h) + SBAddFullHash(int32_t id, const SBFullHash& h) : chunk_id(id), deprecated_received(), full_hash(h) {} SBAddFullHash() : chunk_id(), deprecated_received(), full_hash() {} - int32 GetAddChunkId() const { return chunk_id; } + int32_t GetAddChunkId() const { return chunk_id; } SBPrefix GetAddPrefix() const { return full_hash.prefix; } }; struct SBSubFullHash { - int32 chunk_id; - int32 add_chunk_id; + int32_t chunk_id; + int32_t add_chunk_id; SBFullHash full_hash; - SBSubFullHash(int32 id, int32 add_id, const SBFullHash& h) + SBSubFullHash(int32_t id, int32_t add_id, const SBFullHash& h) : chunk_id(id), add_chunk_id(add_id), full_hash(h) {} SBSubFullHash() : chunk_id(), add_chunk_id(), full_hash() {} - int32 GetAddChunkId() const { return add_chunk_id; } + int32_t GetAddChunkId() const { return add_chunk_id; } SBPrefix GetAddPrefix() const { return full_hash.prefix; } }; @@ -139,8 +141,8 @@ void SBProcessSubs(SBAddPrefixes* add_prefixes, SBSubPrefixes* sub_prefixes, std::vector<SBAddFullHash>* add_full_hashes, std::vector<SBSubFullHash>* sub_full_hashes, - const base::hash_set<int32>& add_chunks_deleted, - const base::hash_set<int32>& sub_chunks_deleted); + const base::hash_set<int32_t>& add_chunks_deleted, + const base::hash_set<int32_t>& sub_chunks_deleted); // Abstract interface for storing data. class SafeBrowsingStore { @@ -180,12 +182,13 @@ class SafeBrowsingStore { // and add_chunk_id. virtual bool BeginChunk() = 0; - virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) = 0; - virtual bool WriteAddHash(int32 chunk_id, - const SBFullHash& full_hash) = 0; - virtual bool WriteSubPrefix(int32 chunk_id, - int32 add_chunk_id, SBPrefix prefix) = 0; - virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id, + virtual bool WriteAddPrefix(int32_t chunk_id, SBPrefix prefix) = 0; + virtual bool WriteAddHash(int32_t chunk_id, const SBFullHash& full_hash) = 0; + virtual bool WriteSubPrefix(int32_t chunk_id, + int32_t add_chunk_id, + SBPrefix prefix) = 0; + virtual bool WriteSubHash(int32_t chunk_id, + int32_t add_chunk_id, const SBFullHash& full_hash) = 0; // Collect the chunk data and preferrably store it on disk to @@ -193,17 +196,17 @@ class SafeBrowsingStore { virtual bool FinishChunk() = 0; // Track the chunks which have been seen. - virtual void SetAddChunk(int32 chunk_id) = 0; - virtual bool CheckAddChunk(int32 chunk_id) = 0; - virtual void GetAddChunks(std::vector<int32>* out) = 0; - virtual void SetSubChunk(int32 chunk_id) = 0; - virtual bool CheckSubChunk(int32 chunk_id) = 0; - virtual void GetSubChunks(std::vector<int32>* out) = 0; + virtual void SetAddChunk(int32_t chunk_id) = 0; + virtual bool CheckAddChunk(int32_t chunk_id) = 0; + virtual void GetAddChunks(std::vector<int32_t>* out) = 0; + virtual void SetSubChunk(int32_t chunk_id) = 0; + virtual bool CheckSubChunk(int32_t chunk_id) = 0; + virtual void GetSubChunks(std::vector<int32_t>* out) = 0; // Delete the indicated chunk_id. The chunk will continue to be // visible until the end of the transaction. - virtual void DeleteAddChunk(int32 chunk_id) = 0; - virtual void DeleteSubChunk(int32 chunk_id) = 0; + virtual void DeleteAddChunk(int32_t chunk_id) = 0; + virtual void DeleteSubChunk(int32_t chunk_id) = 0; // May be called during update to verify that the storage is valid. // Return true if the store seems valid. If corruption is detected, diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc index b5ee867..b506261 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" +#include <stddef.h> + #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/md5.h" @@ -17,54 +19,54 @@ namespace { // NOTE(shess): kFileMagic should not be a byte-wise palindrome, so // that byte-order changes force corruption. -const int32 kFileMagic = 0x600D71FE; +const int32_t kFileMagic = 0x600D71FE; // Version history: // Version 6: aad08754/r2814 by erikkay@google.com on 2008-10-02 (sqlite) // Version 7: 6afe28a5/r37435 by shess@chromium.org on 2010-01-28 // Version 8: d3dd0715/r259791 by shess@chromium.org on 2014-03-27 -const int32 kFileVersion = 8; +const int32_t kFileVersion = 8; // ReadAndVerifyHeader() returns this in case of error. -const int32 kInvalidVersion = -1; +const int32_t kInvalidVersion = -1; // Starting with version 8, the storage is sorted and can be sharded to allow // updates to be done with lower memory requirements. Newly written files will // be sharded to need less than this amount of memory during update. Larger // values are preferred to minimize looping overhead during processing. -const int64 kUpdateStorageBytes = 100 * 1024; +const int64_t kUpdateStorageBytes = 100 * 1024; // Prevent excessive sharding by setting a lower limit on the shard stride. // Smaller values should work fine, but very small values will probably lead to // poor performance. Shard stride is indirectly related to // |kUpdateStorageBytes|, setting that very small will bump against this. -const uint32 kMinShardStride = 1 << 24; +const uint32_t kMinShardStride = 1 << 24; // Strides over the entire SBPrefix space. -const uint64 kMaxShardStride = 1ULL << 32; +const uint64_t kMaxShardStride = 1ULL << 32; // Maximum SBPrefix value. const SBPrefix kMaxSBPrefix = 0xFFFFFFFF; // Header at the front of the main database file. struct FileHeader { - int32 magic, version; - uint32 add_chunk_count, sub_chunk_count; - uint32 shard_stride; + int32_t magic, version; + uint32_t add_chunk_count, sub_chunk_count; + uint32_t shard_stride; // TODO(shess): Is this where 64-bit will bite me? Perhaps write a // specialized read/write? }; // Header for each chunk in the chunk-accumulation file. struct ChunkHeader { - uint32 add_prefix_count, sub_prefix_count; - uint32 add_hash_count, sub_hash_count; + uint32_t add_prefix_count, sub_prefix_count; + uint32_t add_hash_count, sub_hash_count; }; // Header for each shard of data in the main database file. struct ShardHeader { - uint32 add_prefix_count, sub_prefix_count; - uint32 add_hash_count, sub_hash_count; + uint32_t add_prefix_count, sub_prefix_count; + uint32_t add_hash_count, sub_hash_count; }; // Enumerate different format-change events for histogramming @@ -194,11 +196,11 @@ bool WriteContainer(const CT& values, FILE* fp, } // Delete the chunks in |deleted| from |chunks|. -void DeleteChunksFromSet(const base::hash_set<int32>& deleted, - std::set<int32>* chunks) { - for (std::set<int32>::iterator iter = chunks->begin(); +void DeleteChunksFromSet(const base::hash_set<int32_t>& deleted, + std::set<int32_t>* chunks) { + for (std::set<int32_t>::iterator iter = chunks->begin(); iter != chunks->end();) { - std::set<int32>::iterator prev = iter++; + std::set<int32_t>::iterator prev = iter++; if (deleted.count(*prev) > 0) chunks->erase(prev); } @@ -220,8 +222,8 @@ bool ReadAndVerifyChecksum(FILE* fp, base::MD5Context* context) { // returned. kInvalidVersion is returned for sanity check or checksum failure. int ReadAndVerifyHeader(const base::FilePath& filename, FileHeader* header, - std::set<int32>* add_chunks, - std::set<int32>* sub_chunks, + std::set<int32_t>* add_chunks, + std::set<int32_t>* sub_chunks, FILE* fp, base::MD5Context* context) { DCHECK(header); @@ -261,9 +263,9 @@ int ReadAndVerifyHeader(const base::FilePath& filename, // Helper function to write out the initial header and chunks-contained data. // Rewinds |fp|, initializes |context|, then writes a file header and // |add_chunks| and |sub_chunks|. -bool WriteHeader(uint32 out_stride, - const std::set<int32>& add_chunks, - const std::set<int32>& sub_chunks, +bool WriteHeader(uint32_t out_stride, + const std::set<int32_t>& add_chunks, + const std::set<int32_t>& sub_chunks, FILE* fp, base::MD5Context* context) { if (!FileRewind(fp)) @@ -400,8 +402,8 @@ class StateInternal { // SBProcessSubs). void MergeDataAndProcess(const StateInternalPos& beg, const StateInternalPos& end, - const base::hash_set<int32>& add_del_cache, - const base::hash_set<int32>& sub_del_cache) { + const base::hash_set<int32_t>& add_del_cache, + const base::hash_set<int32_t>& sub_del_cache) { container_merge(&add_prefixes_, beg.add_prefixes_iter_, end.add_prefixes_iter_, @@ -511,8 +513,8 @@ bool ReadDbStateHelper(const base::FilePath& filename, if (file.get() == NULL) return false; - std::set<int32> add_chunks; - std::set<int32> sub_chunks; + std::set<int32_t> add_chunks; + std::set<int32_t> sub_chunks; base::MD5Context context; FileHeader header; @@ -522,8 +524,8 @@ bool ReadDbStateHelper(const base::FilePath& filename, if (version == kInvalidVersion) return false; - uint64 in_min = 0; - uint64 in_stride = header.shard_stride; + uint64_t in_min = 0; + uint64_t in_stride = header.shard_stride; if (!in_stride) in_stride = kMaxShardStride; if (!IsPowerOfTwo(in_stride)) @@ -548,11 +550,11 @@ bool ReadDbStateHelper(const base::FilePath& filename, if (!ReadAndVerifyChecksum(file.get(), &context)) return false; - int64 size = 0; + int64_t size = 0; if (!base::GetFileSize(filename, &size)) return false; - return static_cast<int64>(ftell(file.get())) == size; + return static_cast<int64_t>(ftell(file.get())) == size; } } // namespace @@ -602,7 +604,7 @@ bool SafeBrowsingStoreFile::CheckValidity() { if (!FileRewind(file_.get())) return OnCorruptDatabase(); - int64 size = 0; + int64_t size = 0; if (!base::GetFileSize(filename_, &size)) return OnCorruptDatabase(); @@ -611,7 +613,7 @@ bool SafeBrowsingStoreFile::CheckValidity() { // Read everything except the final digest. size_t bytes_left = static_cast<size_t>(size); - CHECK(size == static_cast<int64>(bytes_left)); + CHECK(size == static_cast<int64_t>(bytes_left)); if (bytes_left < sizeof(base::MD5Digest)) return OnCorruptDatabase(); bytes_left -= sizeof(base::MD5Digest); @@ -649,7 +651,7 @@ bool SafeBrowsingStoreFile::BeginChunk() { return ClearChunkBuffers(); } -bool SafeBrowsingStoreFile::WriteAddPrefix(int32 chunk_id, SBPrefix prefix) { +bool SafeBrowsingStoreFile::WriteAddPrefix(int32_t chunk_id, SBPrefix prefix) { DCHECK(CalledOnValidThread()); add_prefixes_.push_back(SBAddPrefix(chunk_id, prefix)); return true; @@ -686,22 +688,23 @@ bool SafeBrowsingStoreFile::GetAddFullHashes( return true; } -bool SafeBrowsingStoreFile::WriteAddHash(int32 chunk_id, +bool SafeBrowsingStoreFile::WriteAddHash(int32_t chunk_id, const SBFullHash& full_hash) { DCHECK(CalledOnValidThread()); add_hashes_.push_back(SBAddFullHash(chunk_id, full_hash)); return true; } -bool SafeBrowsingStoreFile::WriteSubPrefix(int32 chunk_id, - int32 add_chunk_id, +bool SafeBrowsingStoreFile::WriteSubPrefix(int32_t chunk_id, + int32_t add_chunk_id, SBPrefix prefix) { DCHECK(CalledOnValidThread()); sub_prefixes_.push_back(SBSubPrefix(chunk_id, add_chunk_id, prefix)); return true; } -bool SafeBrowsingStoreFile::WriteSubHash(int32 chunk_id, int32 add_chunk_id, +bool SafeBrowsingStoreFile::WriteSubHash(int32_t chunk_id, + int32_t add_chunk_id, const SBFullHash& full_hash) { DCHECK(CalledOnValidThread()); sub_hashes_.push_back(SBSubFullHash(chunk_id, add_chunk_id, full_hash)); @@ -835,7 +838,7 @@ bool SafeBrowsingStoreFile::DoUpdate( return false; // Get chunk file's size for validating counts. - int64 update_size = 0; + int64_t update_size = 0; if (!base::GetFileSize(TemporaryFileForFilename(filename_), &update_size)) return OnCorruptDatabase(); @@ -852,7 +855,7 @@ bool SafeBrowsingStoreFile::DoUpdate( for (int i = 0; i < chunks_written_; ++i) { ChunkHeader header; - int64 ofs = ftell(new_file_.get()); + int64_t ofs = ftell(new_file_.get()); if (ofs == -1) return false; @@ -861,7 +864,7 @@ bool SafeBrowsingStoreFile::DoUpdate( // As a safety measure, make sure that the header describes a sane // chunk, given the remaining file size. - int64 expected_size = ofs + sizeof(ChunkHeader); + int64_t expected_size = ofs + sizeof(ChunkHeader); expected_size += header.add_prefix_count * sizeof(SBAddPrefix); expected_size += header.sub_prefix_count * sizeof(SBSubPrefix); expected_size += header.add_hash_count * sizeof(SBAddFullHash); @@ -883,9 +886,9 @@ bool SafeBrowsingStoreFile::DoUpdate( // Strides must be an even power of two. |in_stride| will be derived from the // input file. |out_stride| will be derived from an estimate of the resulting // file's size. |process_stride| will be the max of both. - uint64 in_stride = kMaxShardStride; - uint64 out_stride = kMaxShardStride; - uint64 process_stride = 0; + uint64_t in_stride = kMaxShardStride; + uint64_t out_stride = kMaxShardStride; + uint64_t process_stride = 0; // Used to verify the input's checksum if |!empty_|. base::MD5Context in_context; @@ -915,13 +918,13 @@ bool SafeBrowsingStoreFile::DoUpdate( // Calculate |out_stride| to break the file down into reasonable shards. { - int64 original_size = 0; + int64_t original_size = 0; if (!empty_ && !base::GetFileSize(filename_, &original_size)) return OnCorruptDatabase(); // Approximate the final size as everything. Subs and deletes will reduce // the size, but modest over-sharding won't hurt much. - int64 shard_size = original_size + update_size; + int64_t shard_size = original_size + update_size; // Keep splitting until a single stride of data fits the target. size_t shifts = 0; @@ -950,9 +953,9 @@ bool SafeBrowsingStoreFile::DoUpdate( } // Start at the beginning of the SBPrefix space. - uint64 in_min = 0; - uint64 out_min = 0; - uint64 process_min = 0; + uint64_t in_min = 0; + uint64_t out_min = 0; + uint64_t process_min = 0; // Start at the beginning of the updates. StateInternalPos new_pos = new_state.StateBegin(); @@ -1098,44 +1101,44 @@ bool SafeBrowsingStoreFile::CancelUpdate() { return ret; } -void SafeBrowsingStoreFile::SetAddChunk(int32 chunk_id) { +void SafeBrowsingStoreFile::SetAddChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); add_chunks_cache_.insert(chunk_id); } -bool SafeBrowsingStoreFile::CheckAddChunk(int32 chunk_id) { +bool SafeBrowsingStoreFile::CheckAddChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); return add_chunks_cache_.count(chunk_id) > 0; } -void SafeBrowsingStoreFile::GetAddChunks(std::vector<int32>* out) { +void SafeBrowsingStoreFile::GetAddChunks(std::vector<int32_t>* out) { DCHECK(CalledOnValidThread()); out->clear(); out->insert(out->end(), add_chunks_cache_.begin(), add_chunks_cache_.end()); } -void SafeBrowsingStoreFile::SetSubChunk(int32 chunk_id) { +void SafeBrowsingStoreFile::SetSubChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); sub_chunks_cache_.insert(chunk_id); } -bool SafeBrowsingStoreFile::CheckSubChunk(int32 chunk_id) { +bool SafeBrowsingStoreFile::CheckSubChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); return sub_chunks_cache_.count(chunk_id) > 0; } -void SafeBrowsingStoreFile::GetSubChunks(std::vector<int32>* out) { +void SafeBrowsingStoreFile::GetSubChunks(std::vector<int32_t>* out) { DCHECK(CalledOnValidThread()); out->clear(); out->insert(out->end(), sub_chunks_cache_.begin(), sub_chunks_cache_.end()); } -void SafeBrowsingStoreFile::DeleteAddChunk(int32 chunk_id) { +void SafeBrowsingStoreFile::DeleteAddChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); add_del_cache_.insert(chunk_id); } -void SafeBrowsingStoreFile::DeleteSubChunk(int32 chunk_id) { +void SafeBrowsingStoreFile::DeleteSubChunk(int32_t chunk_id) { DCHECK(CalledOnValidThread()); sub_del_cache_.insert(chunk_id); } diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.h b/chrome/browser/safe_browsing/safe_browsing_store_file.h index 4d59bc4..730672c 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.h +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_ +#include <stdint.h> + #include <set> #include <vector> @@ -13,6 +15,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/sequenced_task_runner.h" namespace safe_browsing { @@ -20,48 +23,48 @@ namespace safe_browsing { // Implement SafeBrowsingStore in terms of a flat file. The file // format is pretty literal: // -// int32 magic; // magic number "validating" file -// int32 version; // format version +// int32_t magic; // magic number "validating" file +// int32_t version; // format version // // // Counts for the various data which follows the header. -// uint32 add_chunk_count; // Chunks seen, including empties. -// uint32 sub_chunk_count; // Ditto. -// uint32 shard_stride; // SBPrefix space covered per shard. +// uint32_t add_chunk_count; // Chunks seen, including empties. +// uint32_t sub_chunk_count; // Ditto. +// uint32_t shard_stride; // SBPrefix space covered per shard. // // 0==entire space in one shard. // // Sorted by chunk_id. // array[add_chunk_count] { -// int32 chunk_id; +// int32_t chunk_id; // } // // Sorted by chunk_id. // array[sub_chunk_count] { -// int32 chunk_id; +// int32_t chunk_id; // } // MD5Digest header_checksum; // Checksum over preceeding data. // // // Sorted by prefix, then add chunk_id, then hash, both within shards and // // overall. // array[from 0 to wraparound to 0 by shard_stride] { -// uint32 add_prefix_count; -// uint32 sub_prefix_count; -// uint32 add_hash_count; -// uint32 sub_hash_count; +// uint32_t add_prefix_count; +// uint32_t sub_prefix_count; +// uint32_t add_hash_count; +// uint32_t sub_hash_count; // array[add_prefix_count] { -// int32 chunk_id; -// uint32 prefix; +// int32_t chunk_id; +// uint32_t prefix; // } // array[sub_prefix_count] { -// int32 chunk_id; -// int32 add_chunk_id; -// uint32 add_prefix; +// int32_t chunk_id; +// int32_t add_chunk_id; +// uint32_t add_prefix; // } // array[add_hash_count] { -// int32 chunk_id; -// int32 received_time; // From base::Time::ToTimeT(). +// int32_t chunk_id; +// int32_t received_time; // From base::Time::ToTimeT(). // char[32] full_hash; // } // array[sub_hash_count] { -// int32 chunk_id; -// int32 add_chunk_id; +// int32_t chunk_id; +// int32_t add_chunk_id; // char[32] add_full_hash; // } // } @@ -86,27 +89,27 @@ namespace safe_browsing { // the list of chunks seen omitted, as that data is tracked in-memory: // // array[] { -// uint32 add_prefix_count; -// uint32 sub_prefix_count; -// uint32 add_hash_count; -// uint32 sub_hash_count; +// uint32_t add_prefix_count; +// uint32_t sub_prefix_count; +// uint32_t add_hash_count; +// uint32_t sub_hash_count; // array[add_prefix_count] { -// int32 chunk_id; -// uint32 prefix; +// int32_t chunk_id; +// uint32_t prefix; // } // array[sub_prefix_count] { -// int32 chunk_id; -// int32 add_chunk_id; -// uint32 add_prefix; +// int32_t chunk_id; +// int32_t add_chunk_id; +// uint32_t add_prefix; // } // array[add_hash_count] { -// int32 chunk_id; -// int32 received_time; // From base::Time::ToTimeT(). +// int32_t chunk_id; +// int32_t received_time; // From base::Time::ToTimeT(). // char[32] full_hash; // } // array[sub_hash_count] { -// int32 chunk_id; -// int32 add_chunk_id; +// int32_t chunk_id; +// int32_t add_chunk_id; // char[32] add_full_hash; // } // } @@ -144,13 +147,13 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore { bool BeginChunk() override; - bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) override; - bool WriteAddHash(int32 chunk_id, const SBFullHash& full_hash) override; - bool WriteSubPrefix(int32 chunk_id, - int32 add_chunk_id, + bool WriteAddPrefix(int32_t chunk_id, SBPrefix prefix) override; + bool WriteAddHash(int32_t chunk_id, const SBFullHash& full_hash) override; + bool WriteSubPrefix(int32_t chunk_id, + int32_t add_chunk_id, SBPrefix prefix) override; - bool WriteSubHash(int32 chunk_id, - int32 add_chunk_id, + bool WriteSubHash(int32_t chunk_id, + int32_t add_chunk_id, const SBFullHash& full_hash) override; bool FinishChunk() override; @@ -160,15 +163,15 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore { std::vector<SBAddFullHash>* add_full_hashes_result) override; bool CancelUpdate() override; - void SetAddChunk(int32 chunk_id) override; - bool CheckAddChunk(int32 chunk_id) override; - void GetAddChunks(std::vector<int32>* out) override; - void SetSubChunk(int32 chunk_id) override; - bool CheckSubChunk(int32 chunk_id) override; - void GetSubChunks(std::vector<int32>* out) override; + void SetAddChunk(int32_t chunk_id) override; + bool CheckAddChunk(int32_t chunk_id) override; + void GetAddChunks(std::vector<int32_t>* out) override; + void SetSubChunk(int32_t chunk_id) override; + bool CheckSubChunk(int32_t chunk_id) override; + void GetSubChunks(std::vector<int32_t>* out) override; - void DeleteAddChunk(int32 chunk_id) override; - void DeleteSubChunk(int32 chunk_id) override; + void DeleteAddChunk(int32_t chunk_id) override; + void DeleteSubChunk(int32_t chunk_id) override; // Verify |file_|'s checksum, calling the corruption callback if it // does not check out. Empty input is considered valid. @@ -229,10 +232,10 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore { void ClearUpdateBuffers() { ClearChunkBuffers(); chunks_written_ = 0; - std::set<int32>().swap(add_chunks_cache_); - std::set<int32>().swap(sub_chunks_cache_); - base::hash_set<int32>().swap(add_del_cache_); - base::hash_set<int32>().swap(sub_del_cache_); + std::set<int32_t>().swap(add_chunks_cache_); + std::set<int32_t>().swap(sub_chunks_cache_); + base::hash_set<int32_t>().swap(add_del_cache_); + base::hash_set<int32_t>().swap(sub_del_cache_); } // The sequenced task runner for this object, used to verify that its state @@ -261,15 +264,15 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore { // Cache of chunks which have been seen. Loaded from the database // on BeginUpdate() so that it can be queried during the // transaction. - std::set<int32> add_chunks_cache_; - std::set<int32> sub_chunks_cache_; + std::set<int32_t> add_chunks_cache_; + std::set<int32_t> sub_chunks_cache_; // Cache the set of deleted chunks during a transaction, applied on // FinishUpdate(). // TODO(shess): If the set is small enough, hash_set<> might be // slower than plain set<>. - base::hash_set<int32> add_del_cache_; - base::hash_set<int32> sub_del_cache_; + base::hash_set<int32_t> add_del_cache_; + base::hash_set<int32_t> sub_del_cache_; base::Closure corruption_callback_; diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc index 6b6bac0..ded060b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" @@ -11,6 +14,7 @@ #include "base/md5.h" #include "base/path_service.h" #include "base/test/test_simple_task_runner.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "components/safe_browsing_db/prefix_set.h" #include "components/safe_browsing_db/util.h" @@ -109,11 +113,11 @@ class SafeBrowsingStoreFileTest : public PlatformTest { } // Manually read the shard stride info from the file. - uint32 ReadStride() { + uint32_t ReadStride() { base::ScopedFILE file(base::OpenFile(filename_, "rb")); - const long kOffset = 4 * sizeof(uint32); + const long kOffset = 4 * sizeof(uint32_t); EXPECT_EQ(fseek(file.get(), kOffset, SEEK_SET), 0); - uint32 shard_stride = 0; + uint32_t shard_stride = 0; EXPECT_EQ(fread(&shard_stride, sizeof(shard_stride), 1, file.get()), 1U); return shard_stride; } @@ -506,8 +510,8 @@ TEST_F(SafeBrowsingStoreFileTest, DetectsCorruption) { base::ScopedFILE file(base::OpenFile(filename_, "rb+")); const long kOffset = 60; EXPECT_EQ(fseek(file.get(), kOffset, SEEK_SET), 0); - const uint32 kZero = 0; - uint32 previous = kZero; + const uint32_t kZero = 0; + uint32_t previous = kZero; EXPECT_EQ(fread(&previous, sizeof(previous), 1, file.get()), 1U); EXPECT_NE(previous, kZero); EXPECT_EQ(fseek(file.get(), kOffset, SEEK_SET), 0); @@ -525,8 +529,8 @@ TEST_F(SafeBrowsingStoreFileTest, DetectsCorruption) { } // Make it look like there is a lot of add-chunks-seen data. - const long kAddChunkCountOffset = 2 * sizeof(int32); - const int32 kLargeCount = 1000 * 1000 * 1000; + const long kAddChunkCountOffset = 2 * sizeof(int32_t); + const int32_t kLargeCount = 1000 * 1000 * 1000; file.reset(base::OpenFile(filename_, "rb+")); EXPECT_EQ(fseek(file.get(), kAddChunkCountOffset, SEEK_SET), 0); EXPECT_EQ(fwrite(&kLargeCount, sizeof(kLargeCount), 1, file.get()), 1U); @@ -678,7 +682,7 @@ TEST_F(SafeBrowsingStoreFileTest, GetAddPrefixesAndHashes) { // which shrinking. TEST_F(SafeBrowsingStoreFileTest, Resharding) { // Loop through multiple stride boundaries (1<<32, 1<<31, 1<<30, 1<<29). - const uint32 kTargetStride = 1 << 29; + const uint32_t kTargetStride = 1 << 29; // Each chunk will require 8 bytes per prefix, plus 4 bytes for chunk // information. It should be less than |kTargetFootprint| in the @@ -686,7 +690,7 @@ TEST_F(SafeBrowsingStoreFileTest, Resharding) { // keep the test fast). const size_t kPrefixesPerChunk = 10000; - uint32 shard_stride = 0; + uint32_t shard_stride = 0; int chunk_id = 1; // Add a series of chunks, tracking that the stride size changes in a @@ -711,7 +715,7 @@ TEST_F(SafeBrowsingStoreFileTest, Resharding) { ASSERT_EQ(chunk_id * kPrefixesPerChunk, add_prefixes.size()); // New stride should be the same, or shifted one right. - const uint32 new_shard_stride = ReadStride(); + const uint32_t new_shard_stride = ReadStride(); EXPECT_TRUE((new_shard_stride == shard_stride) || ((new_shard_stride << 1) == shard_stride)); shard_stride = new_shard_stride; @@ -734,7 +738,7 @@ TEST_F(SafeBrowsingStoreFileTest, Resharding) { EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result)); // New stride should be the same, or shifted one left. - const uint32 new_shard_stride = ReadStride(); + const uint32_t new_shard_stride = ReadStride(); EXPECT_TRUE((new_shard_stride == shard_stride) || (new_shard_stride == (shard_stride << 1))); shard_stride = new_shard_stride; diff --git a/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc index 50233c4..2814cb8 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_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 <stdint.h> +#include <string.h> + #include "chrome/browser/safe_browsing/safe_browsing_store.h" #include "components/safe_browsing_db/util.h" @@ -41,8 +44,8 @@ void ProcessHelper(SBAddPrefixes* add_prefixes, SBSubPrefixes* sub_prefixes, std::vector<SBAddFullHash>* add_full_hashes, std::vector<SBSubFullHash>* sub_full_hashes, - const base::hash_set<int32>& add_chunks_deleted, - const base::hash_set<int32>& sub_chunks_deleted) { + const base::hash_set<int32_t>& add_chunks_deleted, + const base::hash_set<int32_t>& sub_chunks_deleted) { std::sort(add_prefixes->begin(), add_prefixes->end(), SBAddPrefixLess<SBAddPrefix,SBAddPrefix>); std::sort(sub_prefixes->begin(), sub_prefixes->end(), @@ -166,7 +169,7 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsEmpty) { SBSubPrefixes sub_prefixes; std::vector<SBSubFullHash> sub_hashes; - const base::hash_set<int32> no_deletions; + const base::hash_set<int32_t> no_deletions; SBProcessSubs(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, no_deletions, no_deletions); EXPECT_TRUE(add_prefixes.empty()); @@ -212,7 +215,7 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsKnockout) { add_hashes.push_back(SBAddFullHash(kAddChunk5, kHash4mod)); sub_hashes.push_back(SBSubFullHash(kSubChunk5, kAddChunk5, kHash4mod)); - const base::hash_set<int32> no_deletions; + const base::hash_set<int32_t> no_deletions; ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, no_deletions, no_deletions); @@ -267,8 +270,8 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) { sub_prefixes.push_back(SBSubPrefix(kSubChunk1, kAddChunk1, kHash3.prefix)); // Subs apply before being deleted. - const base::hash_set<int32> no_deletions; - base::hash_set<int32> sub_deletions; + const base::hash_set<int32_t> no_deletions; + base::hash_set<int32_t> sub_deletions; sub_deletions.insert(kSubChunk1); ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, no_deletions, sub_deletions); @@ -285,7 +288,7 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) { EXPECT_TRUE(sub_hashes.empty()); // Delete the adds, also. - base::hash_set<int32> add_deletions; + base::hash_set<int32_t> add_deletions; add_deletions.insert(kAddChunk1); ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, add_deletions, no_deletions); @@ -301,8 +304,8 @@ TEST(SafeBrowsingStoreTest, Y2K38) { const base::Time future = now + base::TimeDelta::FromDays(3*365); // TODO: Fix file format before 2035. - EXPECT_GT(static_cast<int32>(future.ToTimeT()), 0) - << " (int32)time_t is running out."; + EXPECT_GT(static_cast<int32_t>(future.ToTimeT()), 0) + << " (int32_t)time_t is running out."; } } // namespace safe_browsing diff --git a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h index d32a02a..6ae4c49 100644 --- a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h +++ b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_OBSERVER_H_ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_OBSERVER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 21d992b..4e246ea 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -16,9 +16,12 @@ #include <vector> +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h index 94972a2..c6014db 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util.h +++ b/chrome/browser/safe_browsing/safe_browsing_util.h @@ -7,11 +7,13 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_ +#include <stddef.h> + #include <cstring> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" #include "base/time/time.h" diff --git a/chrome/browser/safe_browsing/sandboxed_dmg_analyzer_mac_unittest.cc b/chrome/browser/safe_browsing/sandboxed_dmg_analyzer_mac_unittest.cc index e0f3c4b..2d1689f 100644 --- a/chrome/browser/safe_browsing/sandboxed_dmg_analyzer_mac_unittest.cc +++ b/chrome/browser/safe_browsing/sandboxed_dmg_analyzer_mac_unittest.cc @@ -5,9 +5,11 @@ #include "chrome/browser/safe_browsing/sandboxed_dmg_analyzer_mac.h" #include <mach-o/loader.h> +#include <stdint.h> #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h index bb08f3e..835be43 100644 --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h @@ -11,10 +11,10 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_SANDBOXED_ZIP_ANALYZER_H_ #define CHROME_BROWSER_SAFE_BROWSING_SANDBOXED_ZIP_ANALYZER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer_unittest.cc b/chrome/browser/safe_browsing/sandboxed_zip_analyzer_unittest.cc index c5073ea..d29f7a98 100644 --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer_unittest.cc +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer_unittest.cc @@ -9,8 +9,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/safe_browsing/zip_analyzer_results.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/safe_browsing/signature_evaluator_mac.mm b/chrome/browser/safe_browsing/signature_evaluator_mac.mm index 6f64eae..415aaf9 100644 --- a/chrome/browser/safe_browsing/signature_evaluator_mac.mm +++ b/chrome/browser/safe_browsing/signature_evaluator_mac.mm @@ -7,6 +7,8 @@ #include <CoreFoundation/CoreFoundation.h> #include <Foundation/Foundation.h> #include <Security/Security.h> +#include <stddef.h> +#include <stdint.h> #include <sys/xattr.h> #include "base/mac/foundation_util.h" diff --git a/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc b/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc index 73f9695..162ff06 100644 --- a/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc +++ b/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc @@ -5,6 +5,8 @@ #include "chrome/browser/safe_browsing/signature_evaluator_mac.h" #include <CoreFoundation/CoreFoundation.h> +#include <stdint.h> +#include <string.h> #include <sys/xattr.h> #include <string> diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.cc b/chrome/browser/safe_browsing/srt_fetcher_win.cc index 1640804..2c0ee0e 100644 --- a/chrome/browser/safe_browsing/srt_fetcher_win.cc +++ b/chrome/browser/safe_browsing/srt_fetcher_win.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/srt_fetcher_win.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/callback_helpers.h" #include "base/command_line.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/metrics/sparse_histogram.h" @@ -346,7 +349,7 @@ void ReportSwReporterRuntime(const base::TimeDelta& reporter_running_time) { } bool has_start_time = false; - int64 start_time_value = 0; + int64_t start_time_value = 0; if (reporter_key.HasValue(kStartTimeValueName) && reporter_key.ReadInt64(kStartTimeValueName, &start_time_value) == ERROR_SUCCESS) { @@ -355,7 +358,7 @@ void ReportSwReporterRuntime(const base::TimeDelta& reporter_running_time) { } bool has_end_time = false; - int64 end_time_value = 0; + int64_t end_time_value = 0; if (reporter_key.HasValue(kEndTimeValueName) && reporter_key.ReadInt64(kEndTimeValueName, &end_time_value) == ERROR_SUCCESS) { @@ -398,7 +401,7 @@ void ReportSwReporterScanTimes() { base::string16 value_name; int uws_id = 0; - int64 raw_scan_time = 0; + int64_t raw_scan_time = 0; int num_scan_times = scan_times_key.GetValueCount(); for (int i = 0; i < num_scan_times; ++i) { if (scan_times_key.GetValueNameAt(i, &value_name) == ERROR_SUCCESS && diff --git a/chrome/browser/safe_browsing/srt_global_error_win.h b/chrome/browser/safe_browsing/srt_global_error_win.h index 6b884ee..5730f77 100644 --- a/chrome/browser/safe_browsing/srt_global_error_win.h +++ b/chrome/browser/safe_browsing/srt_global_error_win.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "chrome/browser/ui/global_error/global_error.h" class GlobalErrorService; diff --git a/chrome/browser/safe_browsing/threat_details.cc b/chrome/browser/safe_browsing/threat_details.cc index 433ccb2..ce8d22d 100644 --- a/chrome/browser/safe_browsing/threat_details.cc +++ b/chrome/browser/safe_browsing/threat_details.cc @@ -6,8 +6,12 @@ #include "chrome/browser/safe_browsing/threat_details.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/threat_details_cache.h" #include "chrome/browser/safe_browsing/threat_details_history.h" @@ -24,7 +28,7 @@ using content::NavigationEntry; using content::WebContents; // Keep in sync with KMaxNodes in renderer/safe_browsing/threat_dom_details -static const uint32 kMaxDomNodes = 500; +static const uint32_t kMaxDomNodes = 500; namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/threat_details_cache.cc b/chrome/browser/safe_browsing/threat_details_cache.cc index 9f170cd..4782bde 100644 --- a/chrome/browser/safe_browsing/threat_details_cache.cc +++ b/chrome/browser/safe_browsing/threat_details_cache.cc @@ -6,6 +6,8 @@ #include "chrome/browser/safe_browsing/threat_details.h" +#include <stdint.h> + #include "base/bind.h" #include "base/lazy_instance.h" #include "base/md5.h" @@ -26,7 +28,7 @@ using content::BrowserThread; // Only send small files for now, a better strategy would use the size // of the whole report and the user's bandwidth. -static const uint32 kMaxBodySizeBytes = 1024; +static const uint32_t kMaxBodySizeBytes = 1024; namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/threat_details_history.cc b/chrome/browser/safe_browsing/threat_details_history.cc index 5e20925..ce25110 100644 --- a/chrome/browser/safe_browsing/threat_details_history.cc +++ b/chrome/browser/safe_browsing/threat_details_history.cc @@ -6,6 +6,8 @@ #include "chrome/browser/safe_browsing/threat_details_history.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/safe_browsing/threat_details_unittest.cc b/chrome/browser/safe_browsing/threat_details_unittest.cc index 0fe6506..35731d6 100644 --- a/chrome/browser/safe_browsing/threat_details_unittest.cc +++ b/chrome/browser/safe_browsing/threat_details_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 <stdint.h> + #include <algorithm> #include "base/bind.h" +#include "base/macros.h" #include "base/pickle.h" #include "base/run_loop.h" #include "base/time/time.h" @@ -270,7 +273,7 @@ class ThreatDetailsTest : public ChromeRenderViewHostTestHarness { std::sort(expected.begin(), expected.end(), &ThreatDetailsTest::ResourceLessThan); - for (uint32 i = 0; i < expected.size(); ++i) { + for (uint32_t i = 0; i < expected.size(); ++i) { VerifyResource(resources[i], expected[i]); } diff --git a/chrome/browser/safe_browsing/two_phase_uploader.cc b/chrome/browser/safe_browsing/two_phase_uploader.cc index fca2c2a..f7a2e95 100644 --- a/chrome/browser/safe_browsing/two_phase_uploader.cc +++ b/chrome/browser/safe_browsing/two_phase_uploader.cc @@ -9,6 +9,7 @@ #include <limits> #include "base/bind.h" +#include "base/macros.h" #include "base/task_runner.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/chrome/browser/safe_browsing/two_phase_uploader.h b/chrome/browser/safe_browsing/two_phase_uploader.h index 18d6b41..5c44bc7 100644 --- a/chrome/browser/safe_browsing/two_phase_uploader.h +++ b/chrome/browser/safe_browsing/two_phase_uploader.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_TWO_PHASE_UPLOADER_H_ #define CHROME_BROWSER_SAFE_BROWSING_TWO_PHASE_UPLOADER_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" @@ -39,7 +41,7 @@ class TwoPhaseUploader : public base::NonThreadSafe { UPLOAD_FILE, STATE_SUCCESS, }; - typedef base::Callback<void(int64 sent, int64 total)> ProgressCallback; + typedef base::Callback<void(int64_t sent, int64_t total)> ProgressCallback; typedef base::Callback<void(State state, int net_error, int response_code, diff --git a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc index 097dafb..0ca1967 100644 --- a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc +++ b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/two_phase_uploader.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/safe_browsing/local_two_phase_testserver.h" @@ -26,7 +28,7 @@ class Delegate { Delegate() : state_(TwoPhaseUploader::STATE_NONE) { } - void ProgressCallback(int64 current, int64 total) {} + void ProgressCallback(int64_t current, int64_t total) {} void FinishCallback(scoped_refptr<MessageLoopRunner> runner, TwoPhaseUploader::State state, diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc index ee863e4..f996ce3 100644 --- a/chrome/browser/safe_browsing/ui_manager.cc +++ b/chrome/browser/safe_browsing/ui_manager.cc @@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/debug/leak_tracker.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" diff --git a/chrome/browser/safe_browsing/ui_manager.h b/chrome/browser/safe_browsing/ui_manager.h index c0b2d93..0a49805 100644 --- a/chrome/browser/safe_browsing/ui_manager.h +++ b/chrome/browser/safe_browsing/ui_manager.h @@ -12,6 +12,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/safe_browsing/unverified_download_field_trial.cc b/chrome/browser/safe_browsing/unverified_download_field_trial.cc index 0eaa06e..c733eae 100644 --- a/chrome/browser/safe_browsing/unverified_download_field_trial.cc +++ b/chrome/browser/safe_browsing/unverified_download_field_trial.cc @@ -11,6 +11,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/safe_browsing/download_protection_util.h" #include "components/variations/variations_associated_data.h" diff --git a/chrome/browser/search/contextual_search_policy_handler_android.h b/chrome/browser/search/contextual_search_policy_handler_android.h index 3794c20..edf1aec 100644 --- a/chrome/browser/search/contextual_search_policy_handler_android.h +++ b/chrome/browser/search/contextual_search_policy_handler_android.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_CONTEXTUAL_SEARCH_POLICY_HANDLER_ANDROID_H_ #define CHROME_BROWSER_SEARCH_CONTEXTUAL_SEARCH_POLICY_HANDLER_ANDROID_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" namespace policy { diff --git a/chrome/browser/search/hotword_audio_history_handler.h b/chrome/browser/search/hotword_audio_history_handler.h index 30dbe1e..957e9df 100644 --- a/chrome/browser/search/hotword_audio_history_handler.h +++ b/chrome/browser/search/hotword_audio_history_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_HOTWORD_AUDIO_HISTORY_HANDLER_H_ #define CHROME_BROWSER_SEARCH_HOTWORD_AUDIO_HISTORY_HANDLER_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/search/hotword_installer_browsertest.cc b/chrome/browser/search/hotword_installer_browsertest.cc index 3293bf2..94a02da 100644 --- a/chrome/browser/search/hotword_installer_browsertest.cc +++ b/chrome/browser/search/hotword_installer_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/extensions/extension_browsertest.h" #include "chrome/browser/extensions/webstore_startup_installer.h" diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc index b2880b54..56adbbb 100644 --- a/chrome/browser/search/hotword_service.cc +++ b/chrome/browser/search/hotword_service.cc @@ -4,11 +4,14 @@ #include "chrome/browser/search/hotword_service.h" +#include <stddef.h> + #include <string> #include "base/command_line.h" #include "base/i18n/case_conversion.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -17,6 +20,7 @@ #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" diff --git a/chrome/browser/search/hotword_service.h b/chrome/browser/search/hotword_service.h index 5a97db6..e8d69dc 100644 --- a/chrome/browser/search/hotword_service.h +++ b/chrome/browser/search/hotword_service.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc index ddd91b1..5afb1a8 100644 --- a/chrome/browser/search/hotword_service_factory.cc +++ b/chrome/browser/search/hotword_service_factory.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/hotword_service.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h index 31139bd..d20ab93f 100644 --- a/chrome/browser/search/hotword_service_factory.h +++ b/chrome/browser/search/hotword_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_HOTWORD_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_HOTWORD_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/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index c1571fb..3d56feb 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -7,6 +7,7 @@ #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/test/test_simple_task_runner.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/test_extension_service.h" diff --git a/chrome/browser/search/iframe_source.h b/chrome/browser/search/iframe_source.h index 80beefc..3897dfd 100644 --- a/chrome/browser/search/iframe_source.h +++ b/chrome/browser/search/iframe_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_IFRAME_SOURCE_H_ #define CHROME_BROWSER_SEARCH_IFRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" // Base class for URL data sources for chrome-search:// iframed content. diff --git a/chrome/browser/search/instant_io_context.h b/chrome/browser/search/instant_io_context.h index 325a395..41b44ac 100644 --- a/chrome/browser/search/instant_io_context.h +++ b/chrome/browser/search/instant_io_context.h @@ -7,7 +7,7 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" class GURL; diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc index 1c168e9..9a89038 100644 --- a/chrome/browser/search/instant_service.cc +++ b/chrome/browser/search/instant_service.cc @@ -4,9 +4,12 @@ #include "chrome/browser/search/instant_service.h" +#include <stddef.h> + #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/favicon/fallback_icon_service_factory.h" #include "chrome/browser/favicon/large_icon_service_factory.h" diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h index 9221aaf..96abba7 100644 --- a/chrome/browser/search/instant_service.h +++ b/chrome/browser/search/instant_service.h @@ -9,6 +9,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "components/history/core/browser/history_types.h" diff --git a/chrome/browser/search/instant_service_factory.h b/chrome/browser/search/instant_service_factory.h index 747b879..155d2cb 100644 --- a/chrome/browser/search/instant_service_factory.h +++ b/chrome/browser/search/instant_service_factory.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_INSTANT_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/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc index 3ba7101..fc9dfb6 100644 --- a/chrome/browser/search/instant_unittest_base.cc +++ b/chrome/browser/search/instant_unittest_base.cc @@ -7,6 +7,7 @@ #include <string> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/instant_service.h" diff --git a/chrome/browser/search/instant_unittest_base.h b/chrome/browser/search/instant_unittest_base.h index 267895a..a427f36 100644 --- a/chrome/browser/search/instant_unittest_base.h +++ b/chrome/browser/search/instant_unittest_base.h @@ -8,6 +8,7 @@ #include <string> #include "base/metrics/field_trial.h" +#include "build/build_config.h" #include "chrome/browser/search/instant_service.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/search/local_files_ntp_source.cc b/chrome/browser/search/local_files_ntp_source.cc index f3732b7..294a71e 100644 --- a/chrome/browser/search/local_files_ntp_source.cc +++ b/chrome/browser/search/local_files_ntp_source.cc @@ -15,6 +15,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index aa104f7..48bfaa8 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -4,9 +4,12 @@ #include "chrome/browser/search/local_ntp_source.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/search/local_ntp_source.h b/chrome/browser/search/local_ntp_source.h index c4085232..efa3771 100644 --- a/chrome/browser/search/local_ntp_source.h +++ b/chrome/browser/search/local_ntp_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_LOCAL_NTP_SOURCE_H_ #define CHROME_BROWSER_SEARCH_LOCAL_NTP_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" class Profile; diff --git a/chrome/browser/search/most_visited_iframe_source.h b/chrome/browser/search/most_visited_iframe_source.h index d38d9b5..9c6ccd0 100644 --- a/chrome/browser/search/most_visited_iframe_source.h +++ b/chrome/browser/search/most_visited_iframe_source.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_SEARCH_MOST_VISITED_IFRAME_SOURCE_H_ #define CHROME_BROWSER_SEARCH_MOST_VISITED_IFRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/search/iframe_source.h" // Serves HTML for displaying suggestions using iframes, e.g. diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc index 1a4b64d..45732f8 100644 --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc @@ -4,6 +4,8 @@ #include "chrome/browser/search/search.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h index 5435641..ff0fb1f 100644 --- a/chrome/browser/search/search.h +++ b/chrome/browser/search/search.h @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "chrome/browser/ui/search/search_model.h" diff --git a/chrome/browser/search/search_terms_tracker.h b/chrome/browser/search/search_terms_tracker.h index d22f28b..635ebef 100644 --- a/chrome/browser/search/search_terms_tracker.h +++ b/chrome/browser/search/search_terms_tracker.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 8807c05..a696260 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -2,12 +2,16 @@ // 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/metrics/field_trial.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_samples.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" diff --git a/chrome/browser/search/suggestions/image_fetcher_impl.h b/chrome/browser/search/suggestions/image_fetcher_impl.h index 82379f2..167865a 100644 --- a/chrome/browser/search/suggestions/image_fetcher_impl.h +++ b/chrome/browser/search/suggestions/image_fetcher_impl.h @@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" #include "components/suggestions/image_fetcher.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc index 034abca..2388f4e 100644 --- a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc +++ b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.h b/chrome/browser/search/suggestions/suggestions_service_factory.h index 7066d5f..18b4364 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.h +++ b/chrome/browser/search/suggestions/suggestions_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_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/search/suggestions/suggestions_source.cc b/chrome/browser/search/suggestions/suggestions_source.cc index 79ea0be..1442a5a 100644 --- a/chrome/browser/search/suggestions/suggestions_source.cc +++ b/chrome/browser/search/suggestions/suggestions_source.cc @@ -4,6 +4,9 @@ #include "chrome/browser/search/suggestions/suggestions_source.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/barrier_closure.h" @@ -48,8 +51,8 @@ void RenderOutputHtml(const SuggestionsProfile& profile, out.push_back(kHtmlBody); out.push_back("<h1>Suggestions</h1>\n<ul>"); - int64 now = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch()) - .ToInternalValue(); + int64_t now = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch()) + .ToInternalValue(); size_t size = profile.suggestions_size(); for (size_t i = 0; i < size; ++i) { const ChromeSuggestion& suggestion = profile.suggestions(i); diff --git a/chrome/browser/search/suggestions/suggestions_source.h b/chrome/browser/search/suggestions/suggestions_source.h index eb31cb4..b753b28 100644 --- a/chrome/browser/search/suggestions/suggestions_source.h +++ b/chrome/browser/search/suggestions/suggestions_source.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/suggestions/proto/suggestions.pb.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/search/thumbnail_source.cc b/chrome/browser/search/thumbnail_source.cc index f0d47c7..b92b102 100644 --- a/chrome/browser/search/thumbnail_source.cc +++ b/chrome/browser/search/thumbnail_source.cc @@ -4,6 +4,8 @@ #include "chrome/browser/search/thumbnail_source.h" +#include <stddef.h> + #include "base/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/search/thumbnail_source.h b/chrome/browser/search/thumbnail_source.h index 35949e9..ef3abd1 100644 --- a/chrome/browser/search/thumbnail_source.h +++ b/chrome/browser/search/thumbnail_source.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.h b/chrome/browser/search_engines/chrome_template_url_service_client.h index c22bb45..03c5903 100644 --- a/chrome/browser/search_engines/chrome_template_url_service_client.h +++ b/chrome/browser/search_engines/chrome_template_url_service_client.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_ #define CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_ +#include "base/macros.h" #include "base/scoped_observer.h" #include "components/history/core/browser/history_service_observer.h" #include "components/search_engines/template_url_service_client.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index fdb0fcd..b34de58 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -8,10 +8,10 @@ #include <functional> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "components/google/core/browser/google_url_tracker.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.h b/chrome/browser/search_engines/search_provider_install_data.h index 512da28..74bebed 100644 --- a/chrome/browser/search_engines/search_provider_install_data.h +++ b/chrome/browser/search_engines/search_provider_install_data.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index 3abdf06..0c415fe 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -4,8 +4,8 @@ #include <string> -#include "base/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h index 1cf2379..8c7de99 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_ #define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/search_engines/search_provider_install_data.h" #include "chrome/common/search_provider.h" diff --git a/chrome/browser/search_engines/template_url_fetcher_factory.h b/chrome/browser/search_engines/template_url_fetcher_factory.h index 7bf7209..77f2fad 100644 --- a/chrome/browser/search_engines/template_url_fetcher_factory.h +++ b/chrome/browser/search_engines/template_url_fetcher_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_FACTORY_H_ #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_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/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc index d8ee05a..7614aba 100644 --- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc +++ b/chrome/browser/search_engines/template_url_scraper_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/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index 8e88588..5a57669 100644 --- a/chrome/browser/search_engines/template_url_service_android.cc +++ b/chrome/browser/search_engines/template_url_service_android.cc @@ -4,6 +4,8 @@ #include "chrome/browser/search_engines/template_url_service_android.h" +#include <stddef.h> + #include "base/android/jni_string.h" #include "base/bind.h" #include "base/format_macros.h" diff --git a/chrome/browser/search_engines/template_url_service_android.h b/chrome/browser/search_engines/template_url_service_android.h index 0ba635f..f296add 100644 --- a/chrome/browser/search_engines/template_url_service_android.h +++ b/chrome/browser/search_engines/template_url_service_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 "base/memory/scoped_ptr.h" #include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service_observer.h" diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index 228b323..7122942 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/search_engines/template_url_service_factory_test_util.h b/chrome/browser/search_engines/template_url_service_factory_test_util.h index d8fb481..860fb8d 100644 --- a/chrome/browser/search_engines/template_url_service_factory_test_util.h +++ b/chrome/browser/search_engines/template_url_service_factory_test_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" class TemplateURLService; class TestingProfile; diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index 608cc6a..1e5eb1e 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc @@ -4,6 +4,7 @@ #include "chrome/browser/search_engines/template_url_service_test_util.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h index 6428f18..3cf92ec 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.h +++ b/chrome/browser/search_engines/template_url_service_test_util.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.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/strings/string16.h" diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc index 7fc76fe..c9e66be 100644 --- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc +++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_brand.h" #include "chrome/browser/google/google_url_tracker_factory.h" diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.h b/chrome/browser/search_engines/ui_thread_search_terms_data.h index 51ebf15..0b85ffd 100644 --- a/chrome/browser/search_engines/ui_thread_search_terms_data.h +++ b/chrome/browser/search_engines/ui_thread_search_terms_data.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/search_engines/search_terms_data.h" diff --git a/chrome/browser/service_process/service_process_control.cc b/chrome/browser/service_process/service_process_control.cc index 5181ed6..f16da9c 100644 --- a/chrome/browser/service_process/service_process_control.cc +++ b/chrome/browser/service_process/service_process_control.cc @@ -18,6 +18,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/upgrade_detector.h" @@ -159,7 +160,7 @@ bool ServiceProcessControl::OnMessageReceived(const IPC::Message& message) { return handled; } -void ServiceProcessControl::OnChannelConnected(int32 peer_pid) { +void ServiceProcessControl::OnChannelConnected(int32_t peer_pid) { DCHECK_CURRENTLY_ON(BrowserThread::UI); UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents", @@ -351,7 +352,7 @@ void ServiceProcessControl::Launcher::Notify() { void ServiceProcessControl::Launcher::DoDetectLaunched() { DCHECK(!notify_task_.is_null()); - const uint32 kMaxLaunchDetectRetries = 10; + const uint32_t kMaxLaunchDetectRetries = 10; launched_ = CheckServiceProcessReady(); int exit_code = 0; diff --git a/chrome/browser/service_process/service_process_control.h b/chrome/browser/service_process/service_process_control.h index d2935c4..80e18b6 100644 --- a/chrome/browser/service_process/service_process_control.h +++ b/chrome/browser/service_process/service_process_control.h @@ -5,18 +5,20 @@ #ifndef CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_ #define CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_ +#include <stdint.h> + #include <queue> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/cancelable_callback.h" #include "base/id_map.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/process/process.h" +#include "build/build_config.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ipc/ipc_channel_proxy.h" @@ -99,7 +101,7 @@ class ServiceProcessControl : public IPC::Sender, // IPC::Listener implementation. bool OnMessageReceived(const IPC::Message& message) override; - void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32_t peer_pid) override; void OnChannelError() override; // IPC::Sender implementation @@ -166,7 +168,7 @@ class ServiceProcessControl : public IPC::Sender, scoped_ptr<base::CommandLine> cmd_line_; base::Closure notify_task_; bool launched_; - uint32 retry_count_; + uint32_t retry_count_; base::Process process_; }; diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc index 8228194..2fa2f29 100644 --- a/chrome/browser/service_process/service_process_control_browsertest.cc +++ b/chrome/browser/service_process/service_process_control_browsertest.cc @@ -15,6 +15,7 @@ #include "base/single_thread_task_runner.h" #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/service_process_util.h" diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.cc b/chrome/browser/services/gcm/fake_gcm_profile_service.cc index 8782695..c1a5ee4 100644 --- a/chrome/browser/services/gcm/fake_gcm_profile_service.cc +++ b/chrome/browser/services/gcm/fake_gcm_profile_service.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/format_macros.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.h b/chrome/browser/services/gcm/fake_gcm_profile_service.h index 16950f1..57d114a 100644 --- a/chrome/browser/services/gcm/fake_gcm_profile_service.h +++ b/chrome/browser/services/gcm/fake_gcm_profile_service.h @@ -8,6 +8,7 @@ #include <list> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/gcm_driver/gcm_driver.h" #include "components/gcm_driver/gcm_profile_service.h" diff --git a/chrome/browser/services/gcm/fake_signin_manager.cc b/chrome/browser/services/gcm/fake_signin_manager.cc index 36e1702..b41795b 100644 --- a/chrome/browser/services/gcm/fake_signin_manager.cc +++ b/chrome/browser/services/gcm/fake_signin_manager.cc @@ -6,6 +6,7 @@ #include "base/observer_list.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/account_tracker_service_factory.h" #include "chrome/browser/signin/chrome_signin_client_factory.h" diff --git a/chrome/browser/services/gcm/fake_signin_manager.h b/chrome/browser/services/gcm/fake_signin_manager.h index 4d1140d..91ff0a1 100644 --- a/chrome/browser/services/gcm/fake_signin_manager.h +++ b/chrome/browser/services/gcm/fake_signin_manager.h @@ -8,6 +8,7 @@ #include <string> #include "base/macros.h" +#include "build/build_config.h" #include "components/signin/core/browser/signin_metrics.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.cc b/chrome/browser/services/gcm/gcm_profile_service_factory.cc index dbbe54c..7e506fe 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_factory.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_factory.cc @@ -5,6 +5,7 @@ #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.h b/chrome/browser/services/gcm/gcm_profile_service_factory.h index 102b68c..4a6197a 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_factory.h +++ b/chrome/browser/services/gcm/gcm_profile_service_factory.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_FACTORY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/gcm_driver/system_encryptor.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc index 2ba5b18..33a68cd 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc @@ -9,8 +9,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h index 09cad9d9..885e2a6 100644 --- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h +++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SERVICES_GCM_INSTANCE_ID_INSTANCE_ID_PROFILE_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/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index ff8a81d..3b30f4c 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -2,15 +2,19 @@ // 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/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" diff --git a/chrome/browser/sessions/chrome_tab_restore_service_client.cc b/chrome/browser/sessions/chrome_tab_restore_service_client.cc index ed1c1b4c..a4adf84 100644 --- a/chrome/browser/sessions/chrome_tab_restore_service_client.cc +++ b/chrome/browser/sessions/chrome_tab_restore_service_client.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_factory.h" diff --git a/chrome/browser/sessions/chrome_tab_restore_service_client.h b/chrome/browser/sessions/chrome_tab_restore_service_client.h index ddc1d45..56648ea 100644 --- a/chrome/browser/sessions/chrome_tab_restore_service_client.h +++ b/chrome/browser/sessions/chrome_tab_restore_service_client.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SESSIONS_CHROME_TAB_RESTORE_SERVICE_CLIENT_H_ #define CHROME_BROWSER_SESSIONS_CHROME_TAB_RESTORE_SERVICE_CLIENT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/sessions/core/tab_restore_service_client.h" class Profile; diff --git a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc index 3a588c4..4f86cdc4 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc @@ -4,9 +4,12 @@ #include "components/sessions/core/persistent_tab_restore_service.h" +#include <stddef.h> + #include <string> #include "base/compiler_specific.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/sessions/restore_on_startup_policy_handler.h b/chrome/browser/sessions/restore_on_startup_policy_handler.h index adde95b..9e0bf2d 100644 --- a/chrome/browser/sessions/restore_on_startup_policy_handler.h +++ b/chrome/browser/sessions/restore_on_startup_policy_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SESSIONS_RESTORE_ON_STARTUP_POLICY_HANDLER_H_ #define CHROME_BROWSER_SESSIONS_RESTORE_ON_STARTUP_POLICY_HANDLER_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" class PrefValueMap; diff --git a/chrome/browser/sessions/session_data_deleter.cc b/chrome/browser/sessions/session_data_deleter.cc index 046c87f..3e62a65 100644 --- a/chrome/browser/sessions/session_data_deleter.cc +++ b/chrome/browser/sessions/session_data_deleter.cc @@ -2,9 +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/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile_io_data.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index a4ff024..1406de2 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sessions/session_restore.h" +#include <stddef.h> + #include <algorithm> #include <list> #include <set> @@ -14,6 +16,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/alias.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/metrics/field_trial.h" @@ -21,6 +24,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/task/cancelable_task_tracker.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" @@ -753,7 +757,7 @@ Browser* SessionRestore::RestoreSession( Profile* profile, Browser* browser, chrome::HostDesktopType host_desktop_type, - uint32 behavior, + uint32_t behavior, const std::vector<GURL>& urls_to_open) { #if defined(OS_CHROMEOS) chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker( @@ -780,7 +784,7 @@ Browser* SessionRestore::RestoreSession( // static void SessionRestore::RestoreSessionAfterCrash(Browser* browser) { - uint32 behavior = 0; + uint32_t behavior = 0; if (browser->tab_strip_model()->count() == 1) { const content::WebContents* active_tab = browser->tab_strip_model()->GetWebContentsAt(0); diff --git a/chrome/browser/sessions/session_restore.h b/chrome/browser/sessions/session_restore.h index 9264202..61774ee 100644 --- a/chrome/browser/sessions/session_restore.h +++ b/chrome/browser/sessions/session_restore.h @@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback_list.h" +#include "base/macros.h" #include "chrome/browser/ui/host_desktop.h" #include "components/history/core/browser/history_service.h" #include "components/sessions/core/session_types.h" @@ -64,7 +66,7 @@ class SessionRestore { static Browser* RestoreSession(Profile* profile, Browser* browser, chrome::HostDesktopType host_desktop_type, - uint32 behavior, + uint32_t behavior, const std::vector<GURL>& urls_to_open); // Restores the last session when the last session crashed. It's a wrapper diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 975f35e..5bb61c9 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -2,15 +2,19 @@ // 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/base_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/memory_pressure_listener.h" #include "base/process/launch.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/first_run/first_run.h" diff --git a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc index 6209c43..75ffb6c 100644 --- a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc +++ b/chrome/browser/sessions/session_restore_browsertest_chromeos.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 <list> #include <vector> diff --git a/chrome/browser/sessions/session_restore_delegate.cc b/chrome/browser/sessions/session_restore_delegate.cc index 87b3e06..b6785cb 100644 --- a/chrome/browser/sessions/session_restore_delegate.cc +++ b/chrome/browser/sessions/session_restore_delegate.cc @@ -4,6 +4,9 @@ #include "chrome/browser/sessions/session_restore_delegate.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "chrome/browser/sessions/session_restore_stats_collector.h" #include "chrome/browser/sessions/tab_loader.h" diff --git a/chrome/browser/sessions/session_restore_delegate.h b/chrome/browser/sessions/session_restore_delegate.h index 63e40ee..9e5b021 100644 --- a/chrome/browser/sessions/session_restore_delegate.h +++ b/chrome/browser/sessions/session_restore_delegate.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" namespace content { diff --git a/chrome/browser/sessions/session_restore_stats_collector.h b/chrome/browser/sessions/session_restore_stats_collector.h index 9daa043..fe67778 100644 --- a/chrome/browser/sessions/session_restore_stats_collector.h +++ b/chrome/browser/sessions/session_restore_stats_collector.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_STATS_COLLECTOR_H_ #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_STATS_COLLECTOR_H_ +#include <stddef.h> + #include <map> #include "base/callback_list.h" +#include "base/macros.h" #include "base/time/tick_clock.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_restore_delegate.h" diff --git a/chrome/browser/sessions/session_restore_stats_collector_unittest.cc b/chrome/browser/sessions/session_restore_stats_collector_unittest.cc index 538f9720..483e59d 100644 --- a/chrome/browser/sessions/session_restore_stats_collector_unittest.cc +++ b/chrome/browser/sessions/session_restore_stats_collector_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/sessions/session_restore_stats_collector.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/test/simple_test_tick_clock.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/sessions/session_restore_test_helper.h b/chrome/browser/sessions/session_restore_test_helper.h index 63b60a4..26f32d9 100644 --- a/chrome/browser/sessions/session_restore_test_helper.h +++ b/chrome/browser/sessions/session_restore_test_helper.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_ #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_HELPER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sessions/session_restore.h" diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index e326248..ba7c149 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sessions/session_service.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <utility> @@ -16,6 +18,7 @@ #include "base/metrics/histogram.h" #include "base/pickle.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h index ba05f1c..d17a5b0 100644 --- a/chrome/browser/sessions/session_service.h +++ b/chrome/browser/sessions/session_service.h @@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.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/task/cancelable_task_tracker.h" diff --git a/chrome/browser/sessions/session_service_factory.cc b/chrome/browser/sessions/session_service_factory.cc index 8ce4165..225e343d 100644 --- a/chrome/browser/sessions/session_service_factory.cc +++ b/chrome/browser/sessions/session_service_factory.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sessions/session_service_factory.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_data_deleter.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sessions/session_service_test_helper.h b/chrome/browser/sessions/session_service_test_helper.h index 4223b72..036e9a4 100644 --- a/chrome/browser/sessions/session_service_test_helper.h +++ b/chrome/browser/sessions/session_service_test_helper.h @@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_SERVICE_TEST_HELPER_H_ #define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_TEST_HELPER_H_ +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "components/sessions/core/session_id.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 3e7cb16..77b29fc 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_util.h" @@ -16,6 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/sessions/session_tab_helper.h b/chrome/browser/sessions/session_tab_helper.h index eb4ec75..80d39e4 100644 --- a/chrome/browser/sessions/session_tab_helper.h +++ b/chrome/browser/sessions/session_tab_helper.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_TAB_HELPER_H_ #define CHROME_BROWSER_SESSIONS_SESSION_TAB_HELPER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/sessions/core/session_id.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/sessions/tab_loader.cc b/chrome/browser/sessions/tab_loader.cc index 61e86eb..ba5330f 100644 --- a/chrome/browser/sessions/tab_loader.cc +++ b/chrome/browser/sessions/tab_loader.cc @@ -10,6 +10,7 @@ #include "base/memory/memory_pressure_monitor.h" #include "base/metrics/histogram.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/sessions/session_restore_stats_collector.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/sessions/tab_loader.h b/chrome/browser/sessions/tab_loader.h index 11c7dbd..8a06448 100644 --- a/chrome/browser/sessions/tab_loader.h +++ b/chrome/browser/sessions/tab_loader.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_SESSIONS_TAB_LOADER_H_ #define CHROME_BROWSER_SESSIONS_TAB_LOADER_H_ +#include <stddef.h> + #include <list> #include <set> +#include "base/macros.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" diff --git a/chrome/browser/sessions/tab_loader_delegate.cc b/chrome/browser/sessions/tab_loader_delegate.cc index 251096c..d404163 100644 --- a/chrome/browser/sessions/tab_loader_delegate.cc +++ b/chrome/browser/sessions/tab_loader_delegate.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sessions/tab_loader_delegate.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "components/variations/variations_associated_data.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index cc65c1d..a13a186 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -2,12 +2,15 @@ // 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/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc index d1abc0a..b0b3edc 100644 --- a/chrome/browser/sessions/tab_restore_service_factory.cc +++ b/chrome/browser/sessions/tab_restore_service_factory.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sessions/tab_restore_service_factory.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" |