From 571943677d2c1db6dc427b3c06e9a74114154de7 Mon Sep 17 00:00:00 2001 From: avi Date: Mon, 21 Dec 2015 18:12:49 -0800 Subject: [PATCH] Switch to standard integer types in ios/. BUG=138542 TBR=stuartmorgan@chromium.org Review URL: https://codereview.chromium.org/1544743002 Cr-Commit-Position: refs/heads/master@{#366521} --- .../app/deferred_initialization_runner.mm | 2 ++ ios/chrome/app/safe_mode_util.cc | 1 + ios/chrome/app/safe_mode_util_unittest.cc | 1 + ios/chrome/browser/about_flags.h | 2 ++ ios/chrome/browser/about_flags.mm | 9 ++++++--- .../browser/autofill/form_suggestion_label.mm | 8 +++++--- .../browser_state/browser_state_info_cache.cc | 2 ++ .../browser_state/browser_state_info_cache.h | 2 ++ .../chrome_browser_state_impl_io_data.h | 2 +- .../chrome_browser_state_io_data.cc | 4 +++- .../chrome_browser_state_io_data.h | 2 +- ..._the_record_chrome_browser_state_io_data.h | 2 +- .../browser_state_metrics.cc | 2 ++ ios/chrome/browser/chrome_url_constants.cc | 2 ++ .../browser/chrome_url_util_unittest.mm | 1 + .../browser/crash_report/breakpad_helper.mm | 1 + ios/chrome/browser/crash_report/crash_keys.cc | 2 ++ .../browser/dom_distiller/distiller_viewer.h | 1 + .../dom_distiller_service_factory.cc | 1 + .../favicon/large_icon_cache_unittest.cc | 1 + ios/chrome/browser/first_run/first_run.h | 2 +- .../geolocation/CLLocation+XGeoHeader.mm | 9 +++++---- ios/chrome/browser/infobars/infobar.h | 1 + .../browser/infobars/infobar_container_ios.h | 3 +++ .../browser/infobars/infobar_container_ios.mm | 1 + .../browser/infobars/infobar_manager_impl.h | 1 + ios/chrome/browser/install_time_util.h | 4 +++- ios/chrome/browser/install_time_util.mm | 3 ++- ios/chrome/browser/installation_notifier.h | 1 + ios/chrome/browser/installation_notifier.mm | 1 + .../browser/installation_notifier_unittest.mm | 1 + ios/chrome/browser/ios_chrome_io_thread.cc | 3 +++ ios/chrome/browser/ios_chrome_io_thread.h | 9 ++++++--- ios/chrome/browser/memory/memory_debugger.mm | 8 +++++--- ios/chrome/browser/memory/memory_metrics.cc | 15 +++++++++------ ios/chrome/browser/memory/memory_metrics.h | 10 +++++----- .../ios_chrome_metrics_service_accessor.cc | 2 ++ ...hrome_metrics_service_accessor_unittest.cc | 1 + .../ios_chrome_metrics_service_client.cc | 4 +++- .../ios_chrome_metrics_service_client.h | 6 ++++-- ...s_chrome_metrics_services_manager_client.h | 2 +- .../ios_chrome_stability_metrics_provider.h | 2 +- ...ome_stability_metrics_provider_unittest.cc | 2 +- .../net/connection_type_observer_bridge.h | 1 + ios/chrome/browser/net/cookie_util.mm | 1 + ios/chrome/browser/net/crl_set_fetcher.cc | 8 +++++--- ios/chrome/browser/net/crl_set_fetcher.h | 4 +++- ios/chrome/browser/net/image_fetcher.mm | 1 + .../browser/net/image_fetcher_unittest.mm | 2 ++ .../net/ios_chrome_http_user_agent_settings.h | 1 - .../ios_chrome_url_request_context_getter.cc | 1 + .../browser/net/proxy_service_factory.h | 1 - .../browser/passwords/password_controller.mm | 2 ++ .../passwords/password_generation_agent.mm | 2 ++ .../safe_browsing/protocol_manager_helper.h | 1 + .../safe_browsing_blocking_page.cc | 1 + .../safe_browsing/safe_browsing_service.cc | 1 + .../browser/safe_browsing/ui_manager.cc | 1 + .../search_engines/search_engines_util.cc | 2 ++ .../sessions/ios_chrome_session_tab_helper.h | 2 +- .../ios_chrome_tab_restore_service_factory.h | 1 + .../browser/signin/gaia_auth_fetcher_ios.h | 1 + ..._signin_status_metrics_provider_delegate.h | 1 + .../browser/signin/signin_client_impl.cc | 2 ++ .../browser/signin/signin_client_impl.h | 1 - ios/chrome/browser/snapshots/lru_cache.mm | 3 +++ .../browser/snapshots/snapshots_util.mm | 1 + .../browser/suggestions/image_fetcher_impl.h | 1 + .../browser/sync/ios_chrome_sync_client.cc | 1 + .../ios_chrome_local_session_event_router.cc | 2 ++ .../ios_chrome_local_session_event_router.h | 2 ++ .../browser/sync/sync_observer_bridge.h | 2 +- ios/chrome/browser/sync/sync_setup_service.cc | 1 + ios/chrome/browser/sync/sync_setup_service.h | 2 +- .../before_translate_infobar_controller.mm | 1 + .../translate/chrome_ios_translate_client.h | 1 + .../translate_accept_languages_factory.cc | 1 + .../translate_accept_languages_factory.h | 2 +- .../browser/ui/autofill/autofill_client_ios.h | 1 + ios/chrome/browser/ui/background_generator.mm | 1 + ios/chrome/browser/ui/ui_util_unittest.mm | 3 ++- ios/chrome/browser/ui/uikit_ui_util.mm | 2 ++ .../browser/ui/uikit_ui_util_unittest.mm | 1 - ios/chrome/browser/ui/webui/about_ui.cc | 1 + ios/chrome/browser/ui/webui/crashes_ui.cc | 3 +++ ios/chrome/browser/ui/webui/flags_ui.cc | 1 + .../browser/ui/webui/gcm/gcm_internals_ui.cc | 1 + .../ui/webui/net_export/net_export_ui.cc | 1 + ios/chrome/browser/ui/webui/version_ui.cc | 1 + .../updatable_config/updatable_config_base.mm | 2 ++ .../common/app_group/app_group_metrics.h | 1 - .../app_group/app_group_metrics_client.h | 1 - .../app_group/app_group_metrics_mainapp.h | 6 +++--- .../app_group/app_group_metrics_mainapp.mm | 6 ++++-- ios/chrome/test/ios_chrome_unit_test_suite.cc | 1 + ios/chrome/test/ios_chrome_unit_test_suite.h | 2 +- ios/crnet/crnet_environment.h | 1 + ios/crnet/crnet_environment.mm | 1 + ios/crnet/test/crnet_http_tests.mm | 1 + .../cookies/cookie_creation_time_manager.mm | 1 + .../cookie_creation_time_manager_unittest.mm | 5 +++-- ios/net/cookies/cookie_store_ios.h | 1 + ios/net/cookies/cookie_store_ios.mm | 2 ++ ios/net/cookies/system_cookie_util.h | 2 ++ ios/net/cookies/system_cookie_util.mm | 1 + ios/net/crn_http_protocol_handler.mm | 3 +++ ...otocol_handler_proxy_with_client_thread.mm | 2 ++ ios/net/request_tracker.h | 1 + ios/net/url_scheme_util_unittest.mm | 1 + .../browser_state/chrome_browser_state.h | 2 +- .../chrome_browser_state_manager.h | 2 +- .../sessions/live_tab_context_provider.h | 4 ++-- ios/public/provider/web/web_ui_ios.h | 1 - .../provider/web/web_ui_ios_controller.h | 1 - .../provider/web/web_ui_ios_message_handler.h | 1 - .../test/test_chrome_browser_provider.h | 1 + .../blink/src/html_character_provider.h | 2 ++ ios/third_party/blink/src/html_token.h | 2 ++ ios/third_party/blink/src/html_token.mm | 2 ++ .../blink/src/html_tokenizer_adapter.h | 9 ++++++--- ios/web/app/web_main_loop.h | 2 +- ios/web/app/web_main_loop.mm | 2 ++ ios/web/app/web_main_runner.mm | 1 + ios/web/browser_url_rewriter_impl.h | 1 + ios/web/history_state_util_unittest.mm | 3 +++ ios/web/navigation/crw_session_controller.mm | 2 ++ ios/web/navigation/crw_session_entry.h | 1 + ios/web/navigation/crw_session_entry.mm | 4 +++- .../navigation/crw_session_entry_unittest.mm | 3 ++- ios/web/navigation/navigation_item_impl.h | 1 - ios/web/navigation/navigation_item_impl.mm | 2 ++ .../navigation/navigation_manager_delegate.h | 2 ++ .../navigation_manager_facade_delegate.h | 2 ++ ios/web/navigation/navigation_manager_impl.h | 4 +++- ios/web/navigation/navigation_manager_impl.mm | 2 ++ ios/web/navigation/nscoder_util.mm | 2 ++ ios/web/navigation/nscoder_util_unittest.mm | 3 ++- ios/web/net/cert_store_impl.h | 1 + ios/web/net/clients/crw_csp_network_client.mm | 2 ++ .../crw_js_injection_network_client.mm | 15 +++++++++------ ios/web/net/cookie_notification_bridge.h | 1 + ios/web/net/request_group_util_unittest.mm | 1 + ios/web/net/request_tracker_impl.h | 1 + ios/web/net/request_tracker_impl.mm | 3 +++ ios/web/net/request_tracker_impl_unittest.mm | 2 ++ ...http_protocol_handler_delegate_unittest.mm | 1 + ios/web/public/app/web_main_parts.h | 1 - ios/web/public/certificate_policy_cache.h | 1 + ios/web/public/navigation_manager.h | 2 ++ ios/web/public/referrer_util_unittest.cc | 1 + ios/web/public/string_util.h | 2 ++ ios/web/public/test/http_server.h | 1 + .../response_providers/response_provider.h | 1 + ios/web/public/test/test_web_state.cc | 2 ++ ios/web/public/test/test_web_state.h | 2 ++ ios/web/public/user_agent.mm | 19 +++++++++++-------- .../web_state/global_web_state_observer.h | 2 ++ .../public/web_state/ui/crw_web_delegate.h | 1 + ios/web/public/web_state/web_state.h | 2 ++ ios/web/public/web_state/web_state_observer.h | 2 ++ .../web_state/web_state_observer_bridge.h | 1 + ios/web/shell/shell_main_delegate.h | 1 - ios/web/shell/shell_network_delegate.h | 2 +- .../shell/shell_url_request_context_getter.h | 1 + ios/web/shell/shell_web_client.h | 1 + ios/web/shell/view_controller.mm | 2 ++ ios/web/string_util.cc | 2 ++ ios/web/string_util_unittest.cc | 2 ++ ios/web/test/test_web_thread.cc | 1 + ios/web/test/web_test_suite.h | 1 + ios/web/web_state/crw_pass_kit_downloader.mm | 1 + .../global_web_state_event_tracker.cc | 3 +++ .../global_web_state_event_tracker.h | 2 ++ ios/web/web_state/js/common_js_unittest.mm | 2 ++ ios/web/web_state/js/core_js_unittest.mm | 2 ++ .../js/crw_js_injection_manager_unittest.mm | 1 + .../ui/crw_ui_web_view_web_controller.h | 5 +++-- .../ui/crw_ui_web_view_web_controller.mm | 10 +++++++--- ios/web/web_state/ui/crw_web_controller.mm | 1 + .../ui/crw_wk_web_view_web_controller.mm | 1 + .../web_controller_observer_bridge.h | 1 + ios/web/web_state/web_state_impl.h | 4 ++++ ios/web/web_state/web_state_impl.mm | 3 +++ ios/web/web_state/web_state_impl_unittest.mm | 2 ++ ios/web/web_thread_impl.cc | 1 + ios/web/web_view_counter_impl.h | 1 + ios/web/web_view_counter_impl.mm | 2 ++ ios/web/web_view_creation_util.mm | 2 ++ .../webui/shared_resources_data_source_ios.cc | 2 ++ .../webui/shared_resources_data_source_ios.h | 2 +- ios/web/webui/url_data_manager_ios.cc | 2 ++ ios/web/webui/url_data_manager_ios.h | 1 + ios/web/webui/url_data_manager_ios_backend.cc | 2 +- ios/web/webui/url_data_manager_ios_backend.h | 2 +- .../web_ui_ios_controller_factory_registry.cc | 2 ++ .../web_ui_ios_controller_factory_registry.h | 1 + ios/web/webui/web_ui_ios_data_source_impl.h | 2 +- ios/web/webui/web_ui_ios_impl.h | 1 + ios/web/webui/web_ui_ios_impl.mm | 2 ++ 199 files changed, 356 insertions(+), 105 deletions(-) diff --git a/ios/chrome/app/deferred_initialization_runner.mm b/ios/chrome/app/deferred_initialization_runner.mm index debaf0d4c4e84b..4f537ff2096470 100644 --- a/ios/chrome/app/deferred_initialization_runner.mm +++ b/ios/chrome/app/deferred_initialization_runner.mm @@ -4,6 +4,8 @@ #import "ios/chrome/app/deferred_initialization_runner.h" +#include + #include "base/logging.h" #include "base/mac/scoped_nsobject.h" diff --git a/ios/chrome/app/safe_mode_util.cc b/ios/chrome/app/safe_mode_util.cc index be448a450fae4b..af5156440f06b0 100644 --- a/ios/chrome/app/safe_mode_util.cc +++ b/ios/chrome/app/safe_mode_util.cc @@ -5,6 +5,7 @@ #include "ios/chrome/app/safe_mode_util.h" #include +#include namespace safe_mode_util { diff --git a/ios/chrome/app/safe_mode_util_unittest.cc b/ios/chrome/app/safe_mode_util_unittest.cc index c5f1d5b6f5ccee..1cede76bd1aa8c 100644 --- a/ios/chrome/app/safe_mode_util_unittest.cc +++ b/ios/chrome/app/safe_mode_util_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 #include #include "base/files/file_path.h" diff --git a/ios/chrome/browser/about_flags.h b/ios/chrome/browser/about_flags.h index a89dfa5283e18b..a9fdcc56b48205 100644 --- a/ios/chrome/browser/about_flags.h +++ b/ios/chrome/browser/about_flags.h @@ -8,6 +8,8 @@ #ifndef IOS_CHROME_BROWSER_ABOUT_FLAGS_H_ #define IOS_CHROME_BROWSER_ABOUT_FLAGS_H_ +#include + #include "components/flags_ui/flags_state.h" namespace base { diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm index 577678f9621644..ddb2b4482f853d 100644 --- a/ios/chrome/browser/about_flags.mm +++ b/ios/chrome/browser/about_flags.mm @@ -7,11 +7,14 @@ #include "ios/chrome/browser/about_flags.h" +#include +#include #import #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" @@ -223,9 +226,9 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { if ([defaults boolForKey:@"UseMobileSafariUA"]) { // Safari uses "Vesion/", followed by the OS version excluding bugfix, where // Chrome puts its product token. - int32 major = 0; - int32 minor = 0; - int32 bugfix = 0; + int32_t major = 0; + int32_t minor = 0; + int32_t bugfix = 0; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); std::string product = base::StringPrintf("Version/%d.%d", major, minor); diff --git a/ios/chrome/browser/autofill/form_suggestion_label.mm b/ios/chrome/browser/autofill/form_suggestion_label.mm index 2b1607995c43dd..ba25aca77a01c6 100644 --- a/ios/chrome/browser/autofill/form_suggestion_label.mm +++ b/ios/chrome/browser/autofill/form_suggestion_label.mm @@ -4,17 +4,19 @@ #import "ios/chrome/browser/autofill/form_suggestion_label.h" -#include - #import +#include + +#include +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "components/autofill/core/browser/credit_card.h" #import "components/autofill/ios/browser/form_suggestion.h" #import "ios/chrome/browser/autofill/form_suggestion_view_client.h" -#import "ios/chrome/browser/ui/uikit_ui_util.h" #include "ios/chrome/browser/ui/ui_util.h" +#import "ios/chrome/browser/ui/uikit_ui_util.h" #include "ios/chrome/grit/ios_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.cc b/ios/chrome/browser/browser_state/browser_state_info_cache.cc index f90ad77d8654a2..ac6869c027eac6 100644 --- a/ios/chrome/browser/browser_state/browser_state_info_cache.cc +++ b/ios/chrome/browser/browser_state/browser_state_info_cache.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/browser_state/browser_state_info_cache.h" +#include + #include #include "base/i18n/case_conversion.h" diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.h b/ios/chrome/browser/browser_state/browser_state_info_cache.h index 76228483bc8525..3ffe1fb215a907 100644 --- a/ios/chrome/browser/browser_state/browser_state_info_cache.h +++ b/ios/chrome/browser/browser_state/browser_state_info_cache.h @@ -5,6 +5,8 @@ #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_BROWSER_STATE_INFO_CACHE_H_ #define IOS_CHROME_BROWSER_BROWSER_STATE_BROWSER_STATE_INFO_CACHE_H_ +#include + #include #include diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h index e374a43d9d7e22..3461e59ace1f23 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h @@ -5,8 +5,8 @@ #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_IO_DATA_H_ #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_IO_DATA_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_store.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc index 0706b780464890..10aa10cc1ca70b 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc @@ -4,9 +4,10 @@ #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" +#include + #include -#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" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h index 26f0017131c2d9..8218bffdb23b89 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h @@ -9,9 +9,9 @@ #include #include -#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" diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h index 3f4dc41ab77080..b83c0ece64e44e 100644 --- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h +++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h @@ -5,10 +5,10 @@ #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_OFF_THE_RECORD_CHROME_BROWSER_STATE_IO_DATA_H_ #define IOS_CHROME_BROWSER_BROWSER_STATE_OFF_THE_RECORD_CHROME_BROWSER_STATE_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 "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" diff --git a/ios/chrome/browser/browser_state_metrics/browser_state_metrics.cc b/ios/chrome/browser/browser_state_metrics/browser_state_metrics.cc index 3d91c63ca132d0..94d133b160258f 100644 --- a/ios/chrome/browser/browser_state_metrics/browser_state_metrics.cc +++ b/ios/chrome/browser/browser_state_metrics/browser_state_metrics.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/browser_state_metrics/browser_state_metrics.h" +#include + #include "components/profile_metrics/counts.h" #include "ios/chrome/browser/browser_state/browser_state_info_cache.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h" diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc index f73a5fb56bc93d..76105b5e7b089b 100644 --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/chrome_url_constants.h" +#include + #include "base/macros.h" const char kChromeUIScheme[] = "chrome"; diff --git a/ios/chrome/browser/chrome_url_util_unittest.mm b/ios/chrome/browser/chrome_url_util_unittest.mm index 8d3b1e110f47ea..187657a8bc61d5 100644 --- a/ios/chrome/browser/chrome_url_util_unittest.mm +++ b/ios/chrome/browser/chrome_url_util_unittest.mm @@ -4,6 +4,7 @@ #import "ios/chrome/browser/chrome_url_util.h" +#include "base/macros.h" #include "ios/chrome/browser/chrome_url_constants.h" #import "net/base/mac/url_conversions.h" #import "testing/gtest_mac.h" diff --git a/ios/chrome/browser/crash_report/breakpad_helper.mm b/ios/chrome/browser/crash_report/breakpad_helper.mm index b3a60f3d959414..252df3da7c5b61 100644 --- a/ios/chrome/browser/crash_report/breakpad_helper.mm +++ b/ios/chrome/browser/crash_report/breakpad_helper.mm @@ -5,6 +5,7 @@ #include "ios/chrome/browser/crash_report/breakpad_helper.h" #import +#include #include "base/auto_reset.h" #include "base/bind.h" diff --git a/ios/chrome/browser/crash_report/crash_keys.cc b/ios/chrome/browser/crash_report/crash_keys.cc index 4e29f5c4babef9..4d2e9ef3df7a54 100644 --- a/ios/chrome/browser/crash_report/crash_keys.cc +++ b/ios/chrome/browser/crash_report/crash_keys.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/crash_report/crash_keys.h" +#include + #include "base/debug/crash_logging.h" #include "base/macros.h" #include "components/crash/core/common/crash_keys.h" diff --git a/ios/chrome/browser/dom_distiller/distiller_viewer.h b/ios/chrome/browser/dom_distiller/distiller_viewer.h index 1cb4f843001325..58904625c5edf6 100644 --- a/ios/chrome/browser/dom_distiller/distiller_viewer.h +++ b/ios/chrome/browser/dom_distiller/distiller_viewer.h @@ -7,6 +7,7 @@ #include +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/dom_distiller/core/dom_distiller_request_view_base.h" #include "components/dom_distiller/core/task_tracker.h" diff --git a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc index 10c4e5261afff5..5c4c22d0292bf8 100644 --- a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc +++ b/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc @@ -5,6 +5,7 @@ #include "ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/threading/sequenced_worker_pool.h" #include "components/dom_distiller/core/article_entry.h" diff --git a/ios/chrome/browser/favicon/large_icon_cache_unittest.cc b/ios/chrome/browser/favicon/large_icon_cache_unittest.cc index 7773cd05fbd907..29d2be37ab93b7 100644 --- a/ios/chrome/browser/favicon/large_icon_cache_unittest.cc +++ b/ios/chrome/browser/favicon/large_icon_cache_unittest.cc @@ -4,6 +4,7 @@ #include "ios/chrome/browser/favicon/large_icon_cache.h" +#include "base/macros.h" #include "components/favicon_base/fallback_icon_style.h" #include "components/favicon_base/favicon_types.h" #include "skia/ext/skia_utils_ios.h" diff --git a/ios/chrome/browser/first_run/first_run.h b/ios/chrome/browser/first_run/first_run.h index 9faf6f294713c3..890344522c59d4 100644 --- a/ios/chrome/browser/first_run/first_run.h +++ b/ios/chrome/browser/first_run/first_run.h @@ -7,7 +7,7 @@ #ifndef IOS_CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ #define IOS_CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace base { class FilePath; diff --git a/ios/chrome/browser/geolocation/CLLocation+XGeoHeader.mm b/ios/chrome/browser/geolocation/CLLocation+XGeoHeader.mm index 1aa9ed7a6c3b27..ec80ee26cb979a 100644 --- a/ios/chrome/browser/geolocation/CLLocation+XGeoHeader.mm +++ b/ios/chrome/browser/geolocation/CLLocation+XGeoHeader.mm @@ -4,7 +4,8 @@ #import "ios/chrome/browser/geolocation/CLLocation+XGeoHeader.h" -#include "base/basictypes.h" +#include + #import "third_party/google_toolbox_for_mac/src/Foundation/GTMStringEncoding.h" NSString* const kGMOLocationDescriptorFormat = @@ -33,11 +34,11 @@ - (NSString*)cr_serializeStringToWebSafeBase64String:(NSString*)data { // Returns the timestamp of this location in microseconds since the UNIX epoch. // Returns 0 if the timestamp is unavailable or invalid. -- (int64)cr_timestampInMicroseconds { +- (int64_t)cr_timestampInMicroseconds { NSTimeInterval seconds = [self.timestamp timeIntervalSince1970]; if (seconds > 0) { - const int64 kSecondsToMicroseconds = 1000000; - return (int64)(seconds * kSecondsToMicroseconds); + const int64_t kSecondsToMicroseconds = 1000000; + return (int64_t)(seconds * kSecondsToMicroseconds); } return 0; } diff --git a/ios/chrome/browser/infobars/infobar.h b/ios/chrome/browser/infobars/infobar.h index 2bc401b9872f9e..faad0a7bd61cc5 100644 --- a/ios/chrome/browser/infobars/infobar.h +++ b/ios/chrome/browser/infobars/infobar.h @@ -6,6 +6,7 @@ #define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_H_ #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "components/infobars/core/infobar.h" #import "ios/public/provider/chrome/browser/ui/infobar_view_delegate.h" diff --git a/ios/chrome/browser/infobars/infobar_container_ios.h b/ios/chrome/browser/infobars/infobar_container_ios.h index 44db6c64ecbea9..e54bb4b05a435d 100644 --- a/ios/chrome/browser/infobars/infobar_container_ios.h +++ b/ios/chrome/browser/infobars/infobar_container_ios.h @@ -7,7 +7,10 @@ #include "components/infobars/core/infobar_container.h" +#include + #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" @class InfoBarContainerView; class InfoBarIOS; diff --git a/ios/chrome/browser/infobars/infobar_container_ios.mm b/ios/chrome/browser/infobars/infobar_container_ios.mm index a09d367a3910e3..ecd0ebe83bd458 100644 --- a/ios/chrome/browser/infobars/infobar_container_ios.mm +++ b/ios/chrome/browser/infobars/infobar_container_ios.mm @@ -4,6 +4,7 @@ #include "ios/chrome/browser/infobars/infobar_container_ios.h" +#include #import #include "base/logging.h" diff --git a/ios/chrome/browser/infobars/infobar_manager_impl.h b/ios/chrome/browser/infobars/infobar_manager_impl.h index 48d265b3af9947..d1a934f2b144c2 100644 --- a/ios/chrome/browser/infobars/infobar_manager_impl.h +++ b/ios/chrome/browser/infobars/infobar_manager_impl.h @@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_IMPL_H_ #define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/infobars/core/infobar_manager.h" #include "ios/web/public/web_state/web_state_observer.h" diff --git a/ios/chrome/browser/install_time_util.h b/ios/chrome/browser/install_time_util.h index 37285cfd83f33d..47a3eb7a240d0d 100644 --- a/ios/chrome/browser/install_time_util.h +++ b/ios/chrome/browser/install_time_util.h @@ -5,11 +5,13 @@ #ifndef IOS_CHROME_BROWSER_INSTALL_TIME_UTIL_H_ #define IOS_CHROME_BROWSER_INSTALL_TIME_UTIL_H_ +#include + #include "base/time/time.h" namespace install_time_util { -extern const int64 kUnknownInstallDate; +extern const int64_t kUnknownInstallDate; // Computes the true installation time of the application based on the current // install time stored in NSUserDefaults and whether or not this is a first run diff --git a/ios/chrome/browser/install_time_util.mm b/ios/chrome/browser/install_time_util.mm index e62ebbf1788ab6..d61ffba2da9a94 100644 --- a/ios/chrome/browser/install_time_util.mm +++ b/ios/chrome/browser/install_time_util.mm @@ -5,6 +5,7 @@ #include "ios/chrome/browser/install_time_util.h" #include +#include #include "base/mac/foundation_util.h" @@ -31,7 +32,7 @@ // 2 is used because 0 is a magic value for Time, and 1 was the pre-M29 value // which was migrated to a specific date (crbug.com/270124). -const int64 kUnknownInstallDate = 2; +const int64_t kUnknownInstallDate = 2; base::Time ComputeInstallationTime(bool is_first_run) { return ComputeInstallationTimeInternal(is_first_run, diff --git a/ios/chrome/browser/installation_notifier.h b/ios/chrome/browser/installation_notifier.h index 55f74d169580ee..8881974923d4c2 100644 --- a/ios/chrome/browser/installation_notifier.h +++ b/ios/chrome/browser/installation_notifier.h @@ -6,6 +6,7 @@ #define IOS_CHROME_BROWSER_INSTALLATION_NOTIFIER_H_ #import +#include class GURL; diff --git a/ios/chrome/browser/installation_notifier.mm b/ios/chrome/browser/installation_notifier.mm index e403685fd6714f..859989a121aab3 100644 --- a/ios/chrome/browser/installation_notifier.mm +++ b/ios/chrome/browser/installation_notifier.mm @@ -4,6 +4,7 @@ #import "ios/chrome/browser/installation_notifier.h" +#include #import #include "base/ios/weak_nsobject.h" diff --git a/ios/chrome/browser/installation_notifier_unittest.mm b/ios/chrome/browser/installation_notifier_unittest.mm index 374a4c2768ecac..1910a2dd29d908 100644 --- a/ios/chrome/browser/installation_notifier_unittest.mm +++ b/ios/chrome/browser/installation_notifier_unittest.mm @@ -4,6 +4,7 @@ #import "ios/chrome/browser/installation_notifier.h" +#include #import #include "base/ios/block_types.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.cc b/ios/chrome/browser/ios_chrome_io_thread.cc index 017303f27cf6ee..dd0cd299f2289e 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.cc +++ b/ios/chrome/browser/ios_chrome_io_thread.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/ios_chrome_io_thread.h" +#include + #include #include "base/bind.h" @@ -13,6 +15,7 @@ #include "base/debug/leak_tracker.h" #include "base/environment.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.h b/ios/chrome/browser/ios_chrome_io_thread.h index 7e338037ba8c1d..4b8514a5cc6715 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.h +++ b/ios/chrome/browser/ios_chrome_io_thread.h @@ -5,13 +5,16 @@ #ifndef IOS_CHROME_BROWSER_IOS_CHROME_IO_THREAD_H_ #define IOS_CHROME_BROWSER_IOS_CHROME_IO_THREAD_H_ +#include +#include + #include #include #include #include -#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" @@ -128,8 +131,8 @@ class IOSChromeIOThread : public web::WebThreadDelegate { scoped_refptr system_cookie_store; scoped_ptr http_user_agent_settings; scoped_ptr network_quality_estimator; - uint16 testing_fixed_http_port; - uint16 testing_fixed_https_port; + uint16_t testing_fixed_http_port; + uint16_t testing_fixed_https_port; Optional enable_tcp_fast_open_for_ssl; Optional initial_max_spdy_concurrent_streams; diff --git a/ios/chrome/browser/memory/memory_debugger.mm b/ios/chrome/browser/memory/memory_debugger.mm index 22bf88181d6da8..13c04a0e8cf003 100644 --- a/ios/chrome/browser/memory/memory_debugger.mm +++ b/ios/chrome/browser/memory/memory_debugger.mm @@ -4,6 +4,8 @@ #import "ios/chrome/browser/memory/memory_debugger.h" +#include + #include "base/ios/ios_util.h" #import "base/mac/scoped_nsobject.h" #import "base/memory/scoped_ptr.h" @@ -40,7 +42,7 @@ @implementation MemoryDebugger { base::scoped_nsobject _continuousMemoryWarningField; // A place to store the artifical memory bloat. - scoped_ptr _bloat; + scoped_ptr _bloat; // Distance the view was pushed up to accomodate the keyboard. CGFloat _keyboardOffset; @@ -482,8 +484,8 @@ - (void)updateBloat { [_bloatField setText:[NSString stringWithFormat:@"%.1f", bloatSizeMB]]; } const CGFloat kBloatSizeBytes = ceil(bloatSizeMB * kNumBytesInMB); - const uint64 kNumberOfBytes = static_cast(kBloatSizeBytes); - _bloat.reset(kNumberOfBytes ? new uint8[kNumberOfBytes] : nullptr); + const uint64_t kNumberOfBytes = static_cast(kBloatSizeBytes); + _bloat.reset(kNumberOfBytes ? new uint8_t[kNumberOfBytes] : nullptr); if (_bloat) { memset(_bloat.get(), -1, kNumberOfBytes); // Occupy memory. } else { diff --git a/ios/chrome/browser/memory/memory_metrics.cc b/ios/chrome/browser/memory/memory_metrics.cc index 360c533f396221..8ce4d9154d2028 100644 --- a/ios/chrome/browser/memory/memory_metrics.cc +++ b/ios/chrome/browser/memory/memory_metrics.cc @@ -5,10 +5,13 @@ #include "ios/chrome/browser/memory/memory_metrics.h" #include +#include +#include #include "base/logging.h" #include "base/process/process_handle.h" #include "base/process/process_metrics.h" +#include "build/build_config.h" #ifdef ARCH_CPU_64_BITS #define cr_vm_region vm_region_64 @@ -27,7 +30,7 @@ const uint64_t kVMPageSize = 4096; namespace memory_util { -uint64 GetFreePhysicalBytes() { +uint64_t GetFreePhysicalBytes() { vm_statistics_data_t vmstat; mach_msg_type_number_t count = HOST_VM_INFO_COUNT; kern_return_t result = @@ -40,14 +43,14 @@ uint64 GetFreePhysicalBytes() { return vmstat.free_count * kVMPageSize; } -uint64 GetRealMemoryUsedInBytes() { +uint64_t GetRealMemoryUsedInBytes() { base::ProcessHandle process_handle = base::GetCurrentProcessHandle(); scoped_ptr process_metrics( base::ProcessMetrics::CreateProcessMetrics(process_handle)); - return static_cast(process_metrics->GetWorkingSetSize()); + return static_cast(process_metrics->GetWorkingSetSize()); } -uint64 GetDirtyVMBytes() { +uint64_t GetDirtyVMBytes() { // Iterate over all VM regions and sum their dirty pages. unsigned int total_dirty_pages = 0; vm_size_t vm_size = 0; @@ -72,7 +75,7 @@ uint64 GetDirtyVMBytes() { return total_dirty_pages * kVMPageSize; } -uint64 GetInternalVMBytes() { +uint64_t GetInternalVMBytes() { task_vm_info_data_t task_vm_info; mach_msg_type_number_t count = TASK_VM_INFO_COUNT; kern_return_t result = @@ -83,7 +86,7 @@ uint64 GetInternalVMBytes() { return 0; } - return static_cast(task_vm_info.internal); + return static_cast(task_vm_info.internal); } } // namespace memory_util diff --git a/ios/chrome/browser/memory/memory_metrics.h b/ios/chrome/browser/memory/memory_metrics.h index 7903848aacaeb9..a7c3195a310803 100644 --- a/ios/chrome/browser/memory/memory_metrics.h +++ b/ios/chrome/browser/memory/memory_metrics.h @@ -5,25 +5,25 @@ #ifndef IOS_CHROME_BROWSER_MEMORY_MEMORY_METRICS_H_ #define IOS_CHROME_BROWSER_MEMORY_MEMORY_METRICS_H_ -#include "base/basictypes.h" +#include namespace memory_util { // "Physical Free" memory metric. This corresponds to the "Physical Memory Free" // value reported by the Memory Monitor in Instruments. -uint64 GetFreePhysicalBytes(); +uint64_t GetFreePhysicalBytes(); // "Real Memory Used" memory metric. This corresponds to the "Real Memory" value // reported for the app by the Memory Monitor in Instruments. -uint64 GetRealMemoryUsedInBytes(); +uint64_t GetRealMemoryUsedInBytes(); // "Xcode Gauge" memory metric. This corresponds to the "Memory" value reported // for the app by the Debug Navigator in Xcode. Only supported in iOS 7 and // later. -uint64 GetInternalVMBytes(); +uint64_t GetInternalVMBytes(); // "Dirty VM" memory metric. This corresponds to the "Dirty Size" value reported // for the app by the VM Tracker in Instruments. -uint64 GetDirtyVMBytes(); +uint64_t GetDirtyVMBytes(); } // namespace memory_util #endif // IOS_CHROME_BROWSER_MEMORY_MEMORY_METRICS_H_ diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc index 239baf104c208e..0840dea5bd2e47 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h" +#include + #include "base/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc index 7f15ff2a8487d3..279fd0881765bc 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc @@ -6,6 +6,7 @@ #include "base/base_switches.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" #include "components/metrics/metrics_pref_names.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc index 2f5ed1831eec9a..8decbb8e4677df 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" +#include + #include #include "base/bind.h" @@ -122,7 +124,7 @@ bool IOSChromeMetricsServiceClient::IsOffTheRecordSessionActive() { return ::IsOffTheRecordSessionActive(); } -int32 IOSChromeMetricsServiceClient::GetProduct() { +int32_t IOSChromeMetricsServiceClient::GetProduct() { return metrics::ChromeUserMetricsExtension::CHROME; } diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h index 196867384c2656..f2a9f8d3f9d642 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h @@ -5,10 +5,12 @@ #ifndef IOS_CHROME_BROWSER_METRICS_IOS_CHROME_METRICS_SERVICE_CLIENT_H_ #define IOS_CHROME_BROWSER_METRICS_IOS_CHROME_METRICS_SERVICE_CLIENT_H_ +#include + #include -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" @@ -54,7 +56,7 @@ class IOSChromeMetricsServiceClient void SetMetricsClientId(const std::string& client_id) override; void OnRecordingDisabled() override; bool IsOffTheRecordSessionActive() override; - int32 GetProduct() override; + int32_t GetProduct() override; std::string GetApplicationLocale() override; bool GetBrand(std::string* brand_code) override; metrics::SystemProfileProto::Channel GetChannel() override; diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h index 0e16a978c3793f..314c00b20ba3a0 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h @@ -5,7 +5,7 @@ #ifndef IOS_CHROME_BROWSER_METRICS_IOS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_ #define IOS_CHROME_BROWSER_METRICS_IOS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h index 51ee723a7f9d60..23c3969c44012c 100644 --- a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h +++ b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h @@ -5,7 +5,7 @@ #ifndef IOS_CHROME_BROWSER_METRICS_CHROME_STABILITY_METRICS_PROVIDER_H_ #define IOS_CHROME_BROWSER_METRICS_CHROME_STABILITY_METRICS_PROVIDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/metrics/user_metrics.h" #include "components/metrics/metrics_provider.h" #include "components/metrics/stability_metrics_helper.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc index 9e7734e1b33f03..767e138420674d 100644 --- a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc @@ -4,7 +4,7 @@ #include "ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/prefs/testing_pref_service.h" diff --git a/ios/chrome/browser/net/connection_type_observer_bridge.h b/ios/chrome/browser/net/connection_type_observer_bridge.h index 30035a16d32806..120cb0e97aeb03 100644 --- a/ios/chrome/browser/net/connection_type_observer_bridge.h +++ b/ios/chrome/browser/net/connection_type_observer_bridge.h @@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_NET_CONNECTION_TYPE_OBSERVER_BRIDGE_H_ #define IOS_CHROME_BROWSER_NET_CONNECTION_TYPE_OBSERVER_BRIDGE_H_ +#include "base/macros.h" #include "net/base/network_change_notifier.h" // Protocol mirroring net::NetworkChangeNotifier::ConnectionTypeObserver. diff --git a/ios/chrome/browser/net/cookie_util.mm b/ios/chrome/browser/net/cookie_util.mm index 5dac5f6d513619..4645610c9ceb1c 100644 --- a/ios/chrome/browser/net/cookie_util.mm +++ b/ios/chrome/browser/net/cookie_util.mm @@ -5,6 +5,7 @@ #include "ios/chrome/browser/net/cookie_util.h" #import +#include #include #include "base/logging.h" diff --git a/ios/chrome/browser/net/crl_set_fetcher.cc b/ios/chrome/browser/net/crl_set_fetcher.cc index 208dc74cac7c8b..4b4e1f869c4b7c 100644 --- a/ios/chrome/browser/net/crl_set_fetcher.cc +++ b/ios/chrome/browser/net/crl_set_fetcher.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/net/crl_set_fetcher.h" +#include + #include "base/bind.h" #include "base/files/file_util.h" #include "base/numerics/safe_conversions.h" @@ -64,7 +66,7 @@ void CRLSetFetcher::DoInitialLoadFromDisk() { LoadFromDisk(GetCRLSetFilePath(), &crl_set_); - uint32 sequence_of_loaded_crl = 0; + uint32_t sequence_of_loaded_crl = 0; if (crl_set_.get()) sequence_of_loaded_crl = crl_set_->sequence(); @@ -119,13 +121,13 @@ void CRLSetFetcher::SetCRLSetIfNewer(scoped_refptr crl_set) { // kPublicKeySHA256 is the SHA256 hash of the SubjectPublicKeyInfo of the key // that's used to sign generated CRL sets. -static const uint8 kPublicKeySHA256[32] = { +static const uint8_t kPublicKeySHA256[32] = { 0x75, 0xda, 0xf8, 0xcb, 0x77, 0x68, 0x40, 0x33, 0x65, 0x4c, 0x97, 0xe5, 0xc5, 0x1b, 0xcd, 0x81, 0x7b, 0x1e, 0xeb, 0x11, 0x2c, 0xe1, 0xa4, 0x33, 0x8c, 0xf5, 0x72, 0x5e, 0xed, 0xb8, 0x43, 0x97, }; -void CRLSetFetcher::RegisterComponent(uint32 sequence_of_loaded_crl) { +void CRLSetFetcher::RegisterComponent(uint32_t sequence_of_loaded_crl) { DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); update_client::CrxComponent component; diff --git a/ios/chrome/browser/net/crl_set_fetcher.h b/ios/chrome/browser/net/crl_set_fetcher.h index 959572a4e50cfc..5f0574246732d7 100644 --- a/ios/chrome/browser/net/crl_set_fetcher.h +++ b/ios/chrome/browser/net/crl_set_fetcher.h @@ -5,6 +5,8 @@ #ifndef IOS_CHROME_BROWSER_NET_CRL_SET_FETCHER_H_ #define IOS_CHROME_BROWSER_NET_CRL_SET_FETCHER_H_ +#include + #include #include "base/compiler_specific.h" @@ -71,7 +73,7 @@ class CRLSetFetcher : public update_client::CrxInstaller { void SetCRLSetIfNewer(scoped_refptr crl_set); // RegisterComponent registers this object as a component updater. - void RegisterComponent(uint32 sequence_of_loaded_crl); + void RegisterComponent(uint32_t sequence_of_loaded_crl); // DoDeleteFromDisk runs on the FILE thread and removes the CRLSet file from // the disk. diff --git a/ios/chrome/browser/net/image_fetcher.mm b/ios/chrome/browser/net/image_fetcher.mm index edf205cdc46046..245045ccaeb38e 100644 --- a/ios/chrome/browser/net/image_fetcher.mm +++ b/ios/chrome/browser/net/image_fetcher.mm @@ -5,6 +5,7 @@ #import "ios/chrome/browser/net/image_fetcher.h" #import +#include #include "base/bind.h" #include "base/location.h" diff --git a/ios/chrome/browser/net/image_fetcher_unittest.mm b/ios/chrome/browser/net/image_fetcher_unittest.mm index 1ce746f4cf7ce5..fd91b8fd2d200c 100644 --- a/ios/chrome/browser/net/image_fetcher_unittest.mm +++ b/ios/chrome/browser/net/image_fetcher_unittest.mm @@ -8,9 +8,11 @@ #include "base/ios/ios_util.h" #include "base/mac/scoped_block.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "net/http/http_response_headers.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h index 5be34bcf4f1f77..ce40131179c1c4 100644 --- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h +++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h @@ -7,7 +7,6 @@ #include -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/prefs/pref_member.h" diff --git a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc index dd2f88c47e4f64..1d6f4bbe1dfe02 100644 --- a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc +++ b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" #include "ios/chrome/browser/ios_chrome_io_thread.h" diff --git a/ios/chrome/browser/net/proxy_service_factory.h b/ios/chrome/browser/net/proxy_service_factory.h index 1b73ad177f9b52..7710680c192153 100644 --- a/ios/chrome/browser/net/proxy_service_factory.h +++ b/ios/chrome/browser/net/proxy_service_factory.h @@ -5,7 +5,6 @@ #ifndef IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ #define IOS_CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/chrome/browser/passwords/password_controller.mm b/ios/chrome/browser/passwords/password_controller.mm index 2326a8606f0a26..9b7c5854ba4777 100644 --- a/ios/chrome/browser/passwords/password_controller.mm +++ b/ios/chrome/browser/passwords/password_controller.mm @@ -4,6 +4,8 @@ #import "ios/chrome/browser/passwords/password_controller.h" +#include + #include #include #include diff --git a/ios/chrome/browser/passwords/password_generation_agent.mm b/ios/chrome/browser/passwords/password_generation_agent.mm index b8838b05b9a268..eeb389c917a8cd 100644 --- a/ios/chrome/browser/passwords/password_generation_agent.mm +++ b/ios/chrome/browser/passwords/password_generation_agent.mm @@ -4,6 +4,8 @@ #import "ios/chrome/browser/passwords/password_generation_agent.h" +#include + #import "base/ios/weak_nsobject.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_block.h" diff --git a/ios/chrome/browser/safe_browsing/protocol_manager_helper.h b/ios/chrome/browser/safe_browsing/protocol_manager_helper.h index cafda86318c2b6..cc4846a3394469 100644 --- a/ios/chrome/browser/safe_browsing/protocol_manager_helper.h +++ b/ios/chrome/browser/safe_browsing/protocol_manager_helper.h @@ -10,6 +10,7 @@ #include +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index ad3ef670206be7..ad87807f9d3cfb 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/ios/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" diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc index 2427cf7633d28a..073d70b98ad53f 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -11,6 +11,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" diff --git a/ios/chrome/browser/safe_browsing/ui_manager.cc b/ios/chrome/browser/safe_browsing/ui_manager.cc index d36e8c01f430a4..115d4ce91114ac 100644 --- a/ios/chrome/browser/safe_browsing/ui_manager.cc +++ b/ios/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/ios/chrome/browser/search_engines/search_engines_util.cc b/ios/chrome/browser/search_engines/search_engines_util.cc index b7ef3160e63873..7d2815446ff733 100644 --- a/ios/chrome/browser/search_engines/search_engines_util.cc +++ b/ios/chrome/browser/search_engines/search_engines_util.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/search_engines/search_engines_util.h" +#include + #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "components/search_engines/search_engines_pref_names.h" diff --git a/ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h b/ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h index fced70e7fa04de..d6f6f355d195df 100644 --- a/ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h +++ b/ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h @@ -5,7 +5,7 @@ #ifndef IOS_CHROME_BROWSER_SESSIONS_IOS_CHROME_SESSION_TAB_HELPER_H_ #define IOS_CHROME_BROWSER_SESSIONS_IOS_CHROME_SESSION_TAB_HELPER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/sessions/core/session_id.h" #include "ios/web/public/web_state/web_state_user_data.h" diff --git a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h index 24463ed3aa7261..eb7f59cda3b285 100644 --- a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h +++ b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h @@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_SESSIONS_IOS_CHROME_TAB_RESTORE_SERVICE_FACTORY_H_ #define IOS_CHROME_BROWSER_SESSIONS_IOS_CHROME_TAB_RESTORE_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h" namespace base { diff --git a/ios/chrome/browser/signin/gaia_auth_fetcher_ios.h b/ios/chrome/browser/signin/gaia_auth_fetcher_ios.h index d7ab6dd75171fc..01ecf710a082ab 100644 --- a/ios/chrome/browser/signin/gaia_auth_fetcher_ios.h +++ b/ios/chrome/browser/signin/gaia_auth_fetcher_ios.h @@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_SIGNIN_GAIA_AUTH_FETCHER_IOS_H_ #define IOS_CHROME_BROWSER_SIGNIN_GAIA_AUTH_FETCHER_IOS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "google_apis/gaia/gaia_auth_fetcher.h" diff --git a/ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h b/ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h index 2e1a3caeb0e400..3672c250c2cc64 100644 --- a/ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h +++ b/ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h @@ -7,6 +7,7 @@ #include +#include "base/macros.h" #include "components/signin/core/browser/signin_status_metrics_provider_delegate.h" #include "ios/chrome/browser/signin/signin_manager_factory_observer.h" diff --git a/ios/chrome/browser/signin/signin_client_impl.cc b/ios/chrome/browser/signin/signin_client_impl.cc index 187e407474f8ab..12956680e0655e 100644 --- a/ios/chrome/browser/signin/signin_client_impl.cc +++ b/ios/chrome/browser/signin/signin_client_impl.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/signin/signin_client_impl.h" +#include + #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" diff --git a/ios/chrome/browser/signin/signin_client_impl.h b/ios/chrome/browser/signin/signin_client_impl.h index 375253a1c67433..fca1fc815ca1e9 100644 --- a/ios/chrome/browser/signin/signin_client_impl.h +++ b/ios/chrome/browser/signin/signin_client_impl.h @@ -5,7 +5,6 @@ #ifndef IOS_CHROME_BROWSER_SIGNIN_SIGNIN_CLIENT_IMPL_H_ #define IOS_CHROME_BROWSER_SIGNIN_SIGNIN_CLIENT_IMPL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/chrome/browser/snapshots/lru_cache.mm b/ios/chrome/browser/snapshots/lru_cache.mm index 01092693f2945d..ccddb348fb3332 100644 --- a/ios/chrome/browser/snapshots/lru_cache.mm +++ b/ios/chrome/browser/snapshots/lru_cache.mm @@ -4,9 +4,12 @@ #import "ios/chrome/browser/snapshots/lru_cache.h" +#include + #include "base/containers/hash_tables.h" #include "base/containers/mru_cache.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace { diff --git a/ios/chrome/browser/snapshots/snapshots_util.mm b/ios/chrome/browser/snapshots/snapshots_util.mm index eb995e9427150d..bb34a6d2f9169e 100644 --- a/ios/chrome/browser/snapshots/snapshots_util.mm +++ b/ios/chrome/browser/snapshots/snapshots_util.mm @@ -10,6 +10,7 @@ #include "base/ios/ios_util.h" #include "base/location.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "ios/web/public/web_thread.h" diff --git a/ios/chrome/browser/suggestions/image_fetcher_impl.h b/ios/chrome/browser/suggestions/image_fetcher_impl.h index 6a6ecedb7e0990..8cd0c01c499813 100644 --- a/ios/chrome/browser/suggestions/image_fetcher_impl.h +++ b/ios/chrome/browser/suggestions/image_fetcher_impl.h @@ -6,6 +6,7 @@ #define IOS_CHROME_BROWSER_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/suggestions/image_fetcher.h" diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.cc b/ios/chrome/browser/sync/ios_chrome_sync_client.cc index 90a53e480d887b..3b538fe2988d19 100644 --- a/ios/chrome/browser/sync/ios_chrome_sync_client.cc +++ b/ios/chrome/browser/sync/ios_chrome_sync_client.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h" #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h" #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.h" diff --git a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.cc b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.cc index 82f6fa184d0726..9144a26bc7f9d3 100644 --- a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.cc +++ b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.cc @@ -4,6 +4,8 @@ #include "ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h" +#include + #include "base/logging.h" #include "components/history/core/browser/history_service.h" #include "components/keyed_service/core/service_access_type.h" diff --git a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h index dcad47007fd2d7..08b7e096a781e3 100644 --- a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h +++ b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h @@ -5,6 +5,8 @@ #ifndef IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H_ #define IOS_CHROME_BROWSER_SYNC_SESSIONS_IOS_CHROME_LOCAL_EVENT_SESSION_ROUTER_H_ +#include + #include #include "base/callback_list.h" diff --git a/ios/chrome/browser/sync/sync_observer_bridge.h b/ios/chrome/browser/sync/sync_observer_bridge.h index 7f78a23c19193f..00f03ff46b8680 100644 --- a/ios/chrome/browser/sync/sync_observer_bridge.h +++ b/ios/chrome/browser/sync/sync_observer_bridge.h @@ -5,9 +5,9 @@ #ifndef IOS_CHROME_BROWSER_SYNC_SYNC_OBSERVER_BRIDGE_H_ #define IOS_CHROME_BROWSER_SYNC_SYNC_OBSERVER_BRIDGE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/ios/weak_nsobject.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "components/sync_driver/sync_service_observer.h" diff --git a/ios/chrome/browser/sync/sync_setup_service.cc b/ios/chrome/browser/sync/sync_setup_service.cc index 9e91e34ea6d5af..a4b43c1a77be4d 100644 --- a/ios/chrome/browser/sync/sync_setup_service.cc +++ b/ios/chrome/browser/sync/sync_setup_service.cc @@ -6,6 +6,7 @@ #include +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "components/sync_driver/sync_prefs.h" #include "components/sync_driver/sync_service.h" diff --git a/ios/chrome/browser/sync/sync_setup_service.h b/ios/chrome/browser/sync/sync_setup_service.h index 491a09bdc27509..0df68223dae03f 100644 --- a/ios/chrome/browser/sync/sync_setup_service.h +++ b/ios/chrome/browser/sync/sync_setup_service.h @@ -7,7 +7,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/ios/chrome/browser/translate/before_translate_infobar_controller.mm b/ios/chrome/browser/translate/before_translate_infobar_controller.mm index 78cfaec643f5a5..f7df14018af3fa 100644 --- a/ios/chrome/browser/translate/before_translate_infobar_controller.mm +++ b/ios/chrome/browser/translate/before_translate_infobar_controller.mm @@ -4,6 +4,7 @@ #include "ios/chrome/browser/translate/before_translate_infobar_controller.h" +#include #import #include "base/logging.h" diff --git a/ios/chrome/browser/translate/chrome_ios_translate_client.h b/ios/chrome/browser/translate/chrome_ios_translate_client.h index 7c8d279ec08e57..63b1f93657cace 100644 --- a/ios/chrome/browser/translate/chrome_ios_translate_client.h +++ b/ios/chrome/browser/translate/chrome_ios_translate_client.h @@ -7,6 +7,7 @@ #include +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/translate/core/browser/translate_client.h" #include "components/translate/core/browser/translate_step.h" diff --git a/ios/chrome/browser/translate/translate_accept_languages_factory.cc b/ios/chrome/browser/translate/translate_accept_languages_factory.cc index a4aa132f02151e..ef1a7cac73a440 100644 --- a/ios/chrome/browser/translate/translate_accept_languages_factory.cc +++ b/ios/chrome/browser/translate/translate_accept_languages_factory.cc @@ -4,6 +4,7 @@ #include "ios/chrome/browser/translate/translate_accept_languages_factory.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "components/keyed_service/core/keyed_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" diff --git a/ios/chrome/browser/translate/translate_accept_languages_factory.h b/ios/chrome/browser/translate/translate_accept_languages_factory.h index 8708142eb5fc40..148525383fc199 100644 --- a/ios/chrome/browser/translate/translate_accept_languages_factory.h +++ b/ios/chrome/browser/translate/translate_accept_languages_factory.h @@ -5,7 +5,7 @@ #ifndef IOS_CHROME_BROWSER_TRANSLATE_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_ #define IOS_CHROME_BROWSER_TRANSLATE_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h" diff --git a/ios/chrome/browser/ui/autofill/autofill_client_ios.h b/ios/chrome/browser/ui/autofill/autofill_client_ios.h index 34d51a11b63225..4fafb4567be1f8 100644 --- a/ios/chrome/browser/ui/autofill/autofill_client_ios.h +++ b/ios/chrome/browser/ui/autofill/autofill_client_ios.h @@ -8,6 +8,7 @@ #include #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h" diff --git a/ios/chrome/browser/ui/background_generator.mm b/ios/chrome/browser/ui/background_generator.mm index a115d830106b0a..31d7f4da359b60 100644 --- a/ios/chrome/browser/ui/background_generator.mm +++ b/ios/chrome/browser/ui/background_generator.mm @@ -5,6 +5,7 @@ #include "ios/chrome/browser/ui/background_generator.h" #import +#include #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" diff --git a/ios/chrome/browser/ui/ui_util_unittest.mm b/ios/chrome/browser/ui/ui_util_unittest.mm index 4ca6928be6e93c..33f4679d8cc7cf 100644 --- a/ios/chrome/browser/ui/ui_util_unittest.mm +++ b/ios/chrome/browser/ui/ui_util_unittest.mm @@ -4,9 +4,10 @@ #import "ios/chrome/browser/ui/ui_util.h" +#include #import -#include "base/basictypes.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" diff --git a/ios/chrome/browser/ui/uikit_ui_util.mm b/ios/chrome/browser/ui/uikit_ui_util.mm index afd0612ecd2c0c..fee073213cc19f 100644 --- a/ios/chrome/browser/ui/uikit_ui_util.mm +++ b/ios/chrome/browser/ui/uikit_ui_util.mm @@ -7,6 +7,8 @@ #import #import #import +#include +#include #import #include diff --git a/ios/chrome/browser/ui/uikit_ui_util_unittest.mm b/ios/chrome/browser/ui/uikit_ui_util_unittest.mm index cc32c7bd19dd71..0e590a8902cac3 100644 --- a/ios/chrome/browser/ui/uikit_ui_util_unittest.mm +++ b/ios/chrome/browser/ui/uikit_ui_util_unittest.mm @@ -4,7 +4,6 @@ #import "ios/chrome/browser/ui/uikit_ui_util.h" -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #import "ios/chrome/browser/ui/ui_util.h" diff --git a/ios/chrome/browser/ui/webui/about_ui.cc b/ios/chrome/browser/ui/webui/about_ui.cc index 97897e71d49e07..8b83d9ef43e818 100644 --- a/ios/chrome/browser/ui/webui/about_ui.cc +++ b/ios/chrome/browser/ui/webui/about_ui.cc @@ -11,6 +11,7 @@ #include "base/format_macros.h" #include "base/i18n/number_formatting.h" +#include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/string_number_conversions.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/ios/chrome/browser/ui/webui/crashes_ui.cc b/ios/chrome/browser/ui/webui/crashes_ui.cc index ebfe9d5e55a581..35765435cd3144 100644 --- a/ios/chrome/browser/ui/webui/crashes_ui.cc +++ b/ios/chrome/browser/ui/webui/crashes_ui.cc @@ -4,8 +4,11 @@ #include "ios/chrome/browser/ui/webui/crashes_ui.h" +#include + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/ios/chrome/browser/ui/webui/flags_ui.cc b/ios/chrome/browser/ui/webui/flags_ui.cc index 95153375391a60..e7ab94fc891063 100644 --- a/ios/chrome/browser/ui/webui/flags_ui.cc +++ b/ios/chrome/browser/ui/webui/flags_ui.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc b/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc index 47e41d7a58a8f4..9a179f71195196 100644 --- a/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc +++ b/ios/chrome/browser/ui/webui/gcm/gcm_internals_ui.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "components/gcm_driver/gcm_client.h" diff --git a/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc b/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc index 342ffebecc8e35..5fd56304efb790 100644 --- a/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc +++ b/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/ios/chrome/browser/ui/webui/version_ui.cc b/ios/chrome/browser/ui/webui/version_ui.cc index 40e0c9433ba2e8..f5dbcc367daa89 100644 --- a/ios/chrome/browser/ui/webui/version_ui.cc +++ b/ios/chrome/browser/ui/webui/version_ui.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "components/version_info/version_info.h" #include "components/version_ui/version_ui_constants.h" #include "grit/components_chromium_strings.h" diff --git a/ios/chrome/browser/updatable_config/updatable_config_base.mm b/ios/chrome/browser/updatable_config/updatable_config_base.mm index 027f699bfc1c5e..f6c4cfd580c00c 100644 --- a/ios/chrome/browser/updatable_config/updatable_config_base.mm +++ b/ios/chrome/browser/updatable_config/updatable_config_base.mm @@ -4,6 +4,8 @@ #import "ios/chrome/browser/updatable_config/updatable_config_base.h" +#include + #include "base/logging.h" #import "base/mac/bind_objc_block.h" #include "base/mac/scoped_nsobject.h" diff --git a/ios/chrome/common/app_group/app_group_metrics.h b/ios/chrome/common/app_group/app_group_metrics.h index f798c2b019e066..6735588f869da1 100644 --- a/ios/chrome/common/app_group/app_group_metrics.h +++ b/ios/chrome/common/app_group/app_group_metrics.h @@ -7,7 +7,6 @@ #import -#include "base/basictypes.h" #include "base/mac/scoped_block.h" #include "ios/chrome/common/app_group/app_group_constants.h" diff --git a/ios/chrome/common/app_group/app_group_metrics_client.h b/ios/chrome/common/app_group/app_group_metrics_client.h index a80929a0486686..0bd0b861b76634 100644 --- a/ios/chrome/common/app_group/app_group_metrics_client.h +++ b/ios/chrome/common/app_group/app_group_metrics_client.h @@ -7,7 +7,6 @@ #import -#include "base/basictypes.h" #include "base/mac/scoped_block.h" #include "ios/chrome/common/app_group/app_group_constants.h" diff --git a/ios/chrome/common/app_group/app_group_metrics_mainapp.h b/ios/chrome/common/app_group/app_group_metrics_mainapp.h index 1690c79401067f..af693f278f5b9c 100644 --- a/ios/chrome/common/app_group/app_group_metrics_mainapp.h +++ b/ios/chrome/common/app_group/app_group_metrics_mainapp.h @@ -6,8 +6,8 @@ #define IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_METRICS_MAINAPP_H_ #import +#include -#include "base/basictypes.h" #include "base/mac/scoped_block.h" #include "ios/chrome/common/app_group/app_group_constants.h" @@ -27,8 +27,8 @@ void ProcessPendingLogs( // use |clientID| as client ID, and |brandCode| as brand code in the logs. void EnableMetrics(NSString* client_id, NSString* brand_code, - int64 installDate, - int64 enableMetricsDate); + int64_t installDate, + int64_t enableMetricsDate); // Disabled the metrics collecting in extensions. void DisableMetrics(); diff --git a/ios/chrome/common/app_group/app_group_metrics_mainapp.mm b/ios/chrome/common/app_group/app_group_metrics_mainapp.mm index 499cdec3ef4085..82818f289e8e11 100644 --- a/ios/chrome/common/app_group/app_group_metrics_mainapp.mm +++ b/ios/chrome/common/app_group/app_group_metrics_mainapp.mm @@ -4,6 +4,8 @@ #include "ios/chrome/common/app_group/app_group_metrics_mainapp.h" +#include + #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #include "ios/chrome/common/app_group/app_group_constants.h" @@ -39,8 +41,8 @@ void ProcessPendingLogs( void EnableMetrics(NSString* client_id, NSString* brand_code, - int64 install_date, - int64 enable_metrics_date) { + int64_t install_date, + int64_t enable_metrics_date) { base::scoped_nsobject shared_defaults( [[NSUserDefaults alloc] initWithSuiteName:ApplicationGroup()]); [shared_defaults setObject:client_id forKey:@(kChromeAppClientID)]; diff --git a/ios/chrome/test/ios_chrome_unit_test_suite.cc b/ios/chrome/test/ios_chrome_unit_test_suite.cc index 09d27777e58fc7..c098d2867242b2 100644 --- a/ios/chrome/test/ios_chrome_unit_test_suite.cc +++ b/ios/chrome/test/ios_chrome_unit_test_suite.cc @@ -4,6 +4,7 @@ #include "ios/chrome/test/ios_chrome_unit_test_suite.h" +#include "base/macros.h" #include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories.h" #include "ios/chrome/browser/chrome_paths.h" #include "ios/chrome/browser/chrome_url_constants.h" diff --git a/ios/chrome/test/ios_chrome_unit_test_suite.h b/ios/chrome/test/ios_chrome_unit_test_suite.h index 5185ab56d1d88d..1b3b7346f6b5b5 100644 --- a/ios/chrome/test/ios_chrome_unit_test_suite.h +++ b/ios/chrome/test/ios_chrome_unit_test_suite.h @@ -5,8 +5,8 @@ #ifndef IOS_CHROME_TEST_IOS_CHROME_UNIT_TEST_SUITE_H_ #define IOS_CHROME_TEST_IOS_CHROME_UNIT_TEST_SUITE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/test/test_suite.h" // Test suite for unit tests. diff --git a/ios/crnet/crnet_environment.h b/ios/crnet/crnet_environment.h index 63aae08382236b..6091ee05bef01e 100644 --- a/ios/crnet/crnet_environment.h +++ b/ios/crnet/crnet_environment.h @@ -6,6 +6,7 @@ #define IOS_CRNET_CRNET_ENVIRONMENT_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm index 6dcf9f30865ba9..3e5650f033023f 100644 --- a/ios/crnet/crnet_environment.mm +++ b/ios/crnet/crnet_environment.mm @@ -16,6 +16,7 @@ #include "base/mac/bind_objc_block.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_block.h" +#include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/ios/crnet/test/crnet_http_tests.mm b/ios/crnet/test/crnet_http_tests.mm index d0c60510b9470f..ab24b3a20349d1 100644 --- a/ios/crnet/test/crnet_http_tests.mm +++ b/ios/crnet/test/crnet_http_tests.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import +#include #import "CrNet.h" diff --git a/ios/net/cookies/cookie_creation_time_manager.mm b/ios/net/cookies/cookie_creation_time_manager.mm index 665b6a39f59f80..48a90eaf650714 100644 --- a/ios/net/cookies/cookie_creation_time_manager.mm +++ b/ios/net/cookies/cookie_creation_time_manager.mm @@ -5,6 +5,7 @@ #include "ios/net/cookies/cookie_creation_time_manager.h" #include +#include #include "base/logging.h" #include "base/strings/sys_string_conversions.h" diff --git a/ios/net/cookies/cookie_creation_time_manager_unittest.mm b/ios/net/cookies/cookie_creation_time_manager_unittest.mm index ac73d383816cdb..54e51616e1e9e5 100644 --- a/ios/net/cookies/cookie_creation_time_manager_unittest.mm +++ b/ios/net/cookies/cookie_creation_time_manager_unittest.mm @@ -5,6 +5,7 @@ #include "ios/net/cookies/cookie_creation_time_manager.h" #import +#include #include "base/ios/ios_util.h" #include "base/time/time.h" @@ -45,7 +46,7 @@ base::Time time = creation_time_manager_.GetCreationTime(cookie); base::Time now = base::Time::Now(); ASSERT_FALSE(time.is_null()); - int64 delta = (now - time).InMilliseconds(); + int64_t delta = (now - time).InMilliseconds(); // On iOS 8, the range is (0, 1000) ms, but on earlier iOS versions the range // is (-500, 500) ms. The intervals tested are actually 1200 ms to allow some // imprecision. @@ -99,7 +100,7 @@ TEST_F(CookieCreationTimeManagerTest, MakeUniqueCreationTimeConflicts) { base::Time creation_time = base::Time::Now(); - int64 time_internal_value = creation_time.ToInternalValue(); + int64_t time_internal_value = creation_time.ToInternalValue(); // Insert two cookies with consecutive times. creation_time_manager_.SetCreationTime(GetCookie(@"A=B"), creation_time); creation_time_manager_.SetCreationTime( diff --git a/ios/net/cookies/cookie_store_ios.h b/ios/net/cookies/cookie_store_ios.h index 9b33415ffaf385..24fddc910f33f3 100644 --- a/ios/net/cookies/cookie_store_ios.h +++ b/ios/net/cookies/cookie_store_ios.h @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm index b353fea4b2e247..2b00ae245f8f53 100644 --- a/ios/net/cookies/cookie_store_ios.mm +++ b/ios/net/cookies/cookie_store_ios.mm @@ -5,6 +5,7 @@ #include "ios/net/cookies/cookie_store_ios.h" #import +#include #include "base/bind.h" #include "base/files/file_path.h" @@ -14,6 +15,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/observer_list.h" diff --git a/ios/net/cookies/system_cookie_util.h b/ios/net/cookies/system_cookie_util.h index 888ddbf57bf05a..7f8e87723d71c5 100644 --- a/ios/net/cookies/system_cookie_util.h +++ b/ios/net/cookies/system_cookie_util.h @@ -5,6 +5,8 @@ #ifndef IOS_NET_COOKIES_SYSTEM_COOKIE_UTIL_H_ #define IOS_NET_COOKIES_SYSTEM_COOKIE_UTIL_H_ +#include + #include "net/cookies/canonical_cookie.h" #if defined(__OBJC__) diff --git a/ios/net/cookies/system_cookie_util.mm b/ios/net/cookies/system_cookie_util.mm index 5414e0f7894e51..444a54538608ab 100644 --- a/ios/net/cookies/system_cookie_util.mm +++ b/ios/net/cookies/system_cookie_util.mm @@ -5,6 +5,7 @@ #include "ios/net/cookies/system_cookie_util.h" #import +#include #include "base/logging.h" #include "base/metrics/histogram.h" diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm index 05609b0740a9b4..0f1a59694bbb62 100644 --- a/ios/net/crn_http_protocol_handler.mm +++ b/ios/net/crn_http_protocol_handler.mm @@ -4,12 +4,15 @@ #import "ios/net/crn_http_protocol_handler.h" +#include + #include #include "base/command_line.h" #include "base/logging.h" #include "base/mac/bind_objc_block.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" diff --git a/ios/net/crn_http_protocol_handler_proxy_with_client_thread.mm b/ios/net/crn_http_protocol_handler_proxy_with_client_thread.mm index 392b6063195d1f..39f28f5ea589ac 100644 --- a/ios/net/crn_http_protocol_handler_proxy_with_client_thread.mm +++ b/ios/net/crn_http_protocol_handler_proxy_with_client_thread.mm @@ -4,6 +4,8 @@ #import "ios/net/crn_http_protocol_handler_proxy_with_client_thread.h" +#include + #include "base/logging.h" #import "base/mac/scoped_nsobject.h" #include "base/time/time.h" diff --git a/ios/net/request_tracker.h b/ios/net/request_tracker.h index f21cb887c7c126..1260b15669e611 100644 --- a/ios/net/request_tracker.h +++ b/ios/net/request_tracker.h @@ -6,6 +6,7 @@ #define IOS_NET_REQUEST_TRACKER_H_ #import +#include #include "base/callback_forward.h" #include "base/mac/scoped_nsobject.h" diff --git a/ios/net/url_scheme_util_unittest.mm b/ios/net/url_scheme_util_unittest.mm index e9635cde1f3f09..ebea8afa62feca 100644 --- a/ios/net/url_scheme_util_unittest.mm +++ b/ios/net/url_scheme_util_unittest.mm @@ -6,6 +6,7 @@ #import +#include "base/macros.h" #import "testing/gtest_mac.h" #include "url/gurl.h" diff --git a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h index bdb13749241792..08dac81b212847 100644 --- a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h +++ b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h @@ -7,9 +7,9 @@ #include -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ios/web/public/browser_state.h" diff --git a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h index 6a824f3441ad31..cec5b460fc05b0 100644 --- a/ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h +++ b/ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h @@ -7,8 +7,8 @@ #include -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" namespace base { class FilePath; diff --git a/ios/public/provider/chrome/browser/sessions/live_tab_context_provider.h b/ios/public/provider/chrome/browser/sessions/live_tab_context_provider.h index 7c1436f0082a73..67757723c7d6fa 100644 --- a/ios/public/provider/chrome/browser/sessions/live_tab_context_provider.h +++ b/ios/public/provider/chrome/browser/sessions/live_tab_context_provider.h @@ -5,7 +5,7 @@ #ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_SESSIONS_LIVE_TAB_CONTEXT_PROVIDER_H_ #define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_SESSIONS_LIVE_TAB_CONTEXT_PROVIDER_H_ -#include "base/basictypes.h" +#include namespace sessions { class LiveTab; @@ -26,7 +26,7 @@ class LiveTabContextProvider { ios::ChromeBrowserState* browser_state) = 0; // Retrieves the context with the given ID, if one exists. - virtual sessions::LiveTabContext* FindContextWithID(int32 desired_id) = 0; + virtual sessions::LiveTabContext* FindContextWithID(int32_t desired_id) = 0; // Retrieves the context for the given tab, if one exists. virtual sessions::LiveTabContext* FindContextForTab( diff --git a/ios/public/provider/web/web_ui_ios.h b/ios/public/provider/web/web_ui_ios.h index 4a88043f23670b..3cfd70177aecf4 100644 --- a/ios/public/provider/web/web_ui_ios.h +++ b/ios/public/provider/web/web_ui_ios.h @@ -7,7 +7,6 @@ #include -#include "base/basictypes.h" #include "base/callback.h" #include "base/strings/string16.h" diff --git a/ios/public/provider/web/web_ui_ios_controller.h b/ios/public/provider/web/web_ui_ios_controller.h index 656072bf66c038..a053132a5c008b 100644 --- a/ios/public/provider/web/web_ui_ios_controller.h +++ b/ios/public/provider/web/web_ui_ios_controller.h @@ -5,7 +5,6 @@ #ifndef IOS_PUBLIC_PROVIDER_WEB_WEB_UI_IOS_CONTROLLER_H_ #define IOS_PUBLIC_PROVIDER_WEB_WEB_UI_IOS_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/strings/string16.h" class GURL; diff --git a/ios/public/provider/web/web_ui_ios_message_handler.h b/ios/public/provider/web/web_ui_ios_message_handler.h index 133dc8280fec6e..f9822bd7f6db54 100644 --- a/ios/public/provider/web/web_ui_ios_message_handler.h +++ b/ios/public/provider/web/web_ui_ios_message_handler.h @@ -5,7 +5,6 @@ #ifndef IOS_PUBLIC_PROVIDER_WEB_WEB_UI_IOS_MESSAGE_HANDLER_H_ #define IOS_PUBLIC_PROVIDER_WEB_WEB_UI_IOS_MESSAGE_HANDLER_H_ -#include "base/basictypes.h" #include "base/strings/string16.h" class GURL; diff --git a/ios/public/test/test_chrome_browser_provider.h b/ios/public/test/test_chrome_browser_provider.h index 2d8ad9c7c5496d..58b6abdf12b2f8 100644 --- a/ios/public/test/test_chrome_browser_provider.h +++ b/ios/public/test/test_chrome_browser_provider.h @@ -5,6 +5,7 @@ #ifndef IOS_PUBLIC_TEST_TEST_CHROME_BROWSER_PROVIDER_H_ #define IOS_PUBLIC_TEST_TEST_CHROME_BROWSER_PROVIDER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" diff --git a/ios/third_party/blink/src/html_character_provider.h b/ios/third_party/blink/src/html_character_provider.h index f6dd4271b77951..265937677651f3 100644 --- a/ios/third_party/blink/src/html_character_provider.h +++ b/ios/third_party/blink/src/html_character_provider.h @@ -5,6 +5,8 @@ #ifndef IOS_THIRD_PARTY_BLINK_SRC_HTML_CHARACTER_PROVIDER_H_ #define IOS_THIRD_PARTY_BLINK_SRC_HTML_CHARACTER_PROVIDER_H_ +#include + #include "ios/third_party/blink/src/html_tokenizer_adapter.h" namespace WebCore { diff --git a/ios/third_party/blink/src/html_token.h b/ios/third_party/blink/src/html_token.h index 103f7b7b0fff77..b787cff2e14216 100644 --- a/ios/third_party/blink/src/html_token.h +++ b/ios/third_party/blink/src/html_token.h @@ -26,6 +26,8 @@ #ifndef HTMLToken_h #define HTMLToken_h +#include + #include #include "ios/third_party/blink/src/html_tokenizer_adapter.h" diff --git a/ios/third_party/blink/src/html_token.mm b/ios/third_party/blink/src/html_token.mm index f05f24ef462b78..50f7e4b29b9749 100644 --- a/ios/third_party/blink/src/html_token.mm +++ b/ios/third_party/blink/src/html_token.mm @@ -23,6 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "ios/third_party/blink/src/html_token.h" namespace { diff --git a/ios/third_party/blink/src/html_tokenizer_adapter.h b/ios/third_party/blink/src/html_tokenizer_adapter.h index a16c5c09f3415d..6663caf44b9ac3 100644 --- a/ios/third_party/blink/src/html_tokenizer_adapter.h +++ b/ios/third_party/blink/src/html_tokenizer_adapter.h @@ -5,8 +5,11 @@ #ifndef IOS_THIRD_PARTY_BLINK_SRC_TOKENIZER_ADAPTER_H_ #define IOS_THIRD_PARTY_BLINK_SRC_TOKENIZER_ADAPTER_H_ -#include "base/basictypes.h" +#include +#include + #include "base/logging.h" +#include "base/macros.h" #define ALWAYS_INLINE inline __attribute__((always_inline)) @@ -23,8 +26,8 @@ #define notImplemented() namespace WebCore { -typedef uint16 UChar; -typedef uint8 LChar; +typedef uint16_t UChar; +typedef uint8_t LChar; template inline bool isASCIIUpper(CharType c) { diff --git a/ios/web/app/web_main_loop.h b/ios/web/app/web_main_loop.h index 8fd9178efabe66..9797cfcb4116ae 100644 --- a/ios/web/app/web_main_loop.h +++ b/ios/web/app/web_main_loop.h @@ -5,7 +5,7 @@ #ifndef IOS_WEB_APP_WEB_MAIN_LOOP_H_ #define IOS_WEB_APP_WEB_MAIN_LOOP_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/web/app/web_main_loop.mm b/ios/web/app/web_main_loop.mm index eede96b88917bf..8381158c8f2b57 100644 --- a/ios/web/app/web_main_loop.mm +++ b/ios/web/app/web_main_loop.mm @@ -4,6 +4,8 @@ #include "ios/web/app/web_main_loop.h" +#include + #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" diff --git a/ios/web/app/web_main_runner.mm b/ios/web/app/web_main_runner.mm index e3bc2ae07c514e..cf0dbba7f2756f 100644 --- a/ios/web/app/web_main_runner.mm +++ b/ios/web/app/web_main_runner.mm @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/i18n/icu_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "ios/web/app/web_main_loop.h" #include "ios/web/public/url_schemes.h" diff --git a/ios/web/browser_url_rewriter_impl.h b/ios/web/browser_url_rewriter_impl.h index a0568f92f957fc..cad43f2ab325d7 100644 --- a/ios/web/browser_url_rewriter_impl.h +++ b/ios/web/browser_url_rewriter_impl.h @@ -7,6 +7,7 @@ #include +#include "base/macros.h" #include "base/memory/singleton.h" #include "ios/web/public/browser_url_rewriter.h" diff --git a/ios/web/history_state_util_unittest.mm b/ios/web/history_state_util_unittest.mm index 8012053c162300..5efbfd3fe01470 100644 --- a/ios/web/history_state_util_unittest.mm +++ b/ios/web/history_state_util_unittest.mm @@ -4,6 +4,9 @@ #import "ios/web/history_state_util.h" +#include + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" #include "url/gurl.h" diff --git a/ios/web/navigation/crw_session_controller.mm b/ios/web/navigation/crw_session_controller.mm index 21e3d8727c4214..71cc610538d50f 100644 --- a/ios/web/navigation/crw_session_controller.mm +++ b/ios/web/navigation/crw_session_controller.mm @@ -4,6 +4,8 @@ #import "ios/web/navigation/crw_session_controller.h" +#include + #include #include diff --git a/ios/web/navigation/crw_session_entry.h b/ios/web/navigation/crw_session_entry.h index 233c453de7ed7b..bb41c68ea7edb7 100644 --- a/ios/web/navigation/crw_session_entry.h +++ b/ios/web/navigation/crw_session_entry.h @@ -6,6 +6,7 @@ #define IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ #import +#include #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/ios/web/navigation/crw_session_entry.mm b/ios/web/navigation/crw_session_entry.mm index 81a95af96a3b43..a4c462ebdb44f4 100644 --- a/ios/web/navigation/crw_session_entry.mm +++ b/ios/web/navigation/crw_session_entry.mm @@ -4,6 +4,8 @@ #import "ios/web/navigation/crw_session_entry.h" +#include + #include "base/mac/objc_property_releaser.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" @@ -115,7 +117,7 @@ - (instancetype)initWithCoder:(NSCoder*)aDecoder { } if ([aDecoder containsValueForKey:web::kSessionEntryTimestampKey]) { - int64 us = [aDecoder decodeInt64ForKey:web::kSessionEntryTimestampKey]; + int64_t us = [aDecoder decodeInt64ForKey:web::kSessionEntryTimestampKey]; _navigationItem->SetTimestamp(base::Time::FromInternalValue(us)); } diff --git a/ios/web/navigation/crw_session_entry_unittest.mm b/ios/web/navigation/crw_session_entry_unittest.mm index 8ffacf7797fdae..de5f7e78826be3 100644 --- a/ios/web/navigation/crw_session_entry_unittest.mm +++ b/ios/web/navigation/crw_session_entry_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import +#include #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" @@ -165,7 +166,7 @@ - (const uint8_t*)decodeBytesForKey:(NSString*)key web::NavigationItem* item = [sessionEntry_ navigationItem]; item->SetVirtualURL(GURL("http://user.friendly")); item->SetTitle(base::SysNSStringToUTF16(@"Title")); - int64 timestamp = item->GetTimestamp().ToInternalValue(); + int64_t timestamp = item->GetTimestamp().ToInternalValue(); std::string virtualUrl = item->GetVirtualURL().spec(); std::string referrerUrl = item->GetReferrer().url.spec(); diff --git a/ios/web/navigation/navigation_item_impl.h b/ios/web/navigation/navigation_item_impl.h index 280fa2b7875d25..f412db3751ce9b 100644 --- a/ios/web/navigation/navigation_item_impl.h +++ b/ios/web/navigation/navigation_item_impl.h @@ -7,7 +7,6 @@ #import -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/ios/web/navigation/navigation_item_impl.mm b/ios/web/navigation/navigation_item_impl.mm index 76ddec71fb7b5f..9d5e3a0680f199 100644 --- a/ios/web/navigation/navigation_item_impl.mm +++ b/ios/web/navigation/navigation_item_impl.mm @@ -4,6 +4,8 @@ #include "ios/web/navigation/navigation_item_impl.h" +#include + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "components/url_formatter/url_formatter.h" diff --git a/ios/web/navigation/navigation_manager_delegate.h b/ios/web/navigation/navigation_manager_delegate.h index 42ff3bdd07f688..aa8b1c0fbd60fc 100644 --- a/ios/web/navigation/navigation_manager_delegate.h +++ b/ios/web/navigation/navigation_manager_delegate.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_DELEGATE_H_ #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_DELEGATE_H_ +#include + namespace web { struct LoadCommittedDetails; diff --git a/ios/web/navigation/navigation_manager_facade_delegate.h b/ios/web/navigation/navigation_manager_facade_delegate.h index b405f04067896f..101e6504f2a97d 100644 --- a/ios/web/navigation/navigation_manager_facade_delegate.h +++ b/ios/web/navigation/navigation_manager_facade_delegate.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_FACADE_DELEGATE_H_ #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_FACADE_DELEGATE_H_ +#include + namespace content { class NavigationController; } diff --git a/ios/web/navigation/navigation_manager_impl.h b/ios/web/navigation/navigation_manager_impl.h index bb7bd7bac29ffd..61e115b883e0a4 100644 --- a/ios/web/navigation/navigation_manager_impl.h +++ b/ios/web/navigation/navigation_manager_impl.h @@ -5,10 +5,12 @@ #ifndef IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ +#include + #include -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "ios/web/public/navigation_manager.h" #include "ui/base/page_transition_types.h" diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm index 882e08940135cb..647171b1d8664f 100644 --- a/ios/web/navigation/navigation_manager_impl.mm +++ b/ios/web/navigation/navigation_manager_impl.mm @@ -4,6 +4,8 @@ #include "ios/web/navigation/navigation_manager_impl.h" +#include + #include "base/logging.h" #import "ios/web/navigation/crw_session_controller+private_constructors.h" #import "ios/web/navigation/crw_session_controller.h" diff --git a/ios/web/navigation/nscoder_util.mm b/ios/web/navigation/nscoder_util.mm index 9218f37ff4a9a5..ea837cf435238e 100644 --- a/ios/web/navigation/nscoder_util.mm +++ b/ios/web/navigation/nscoder_util.mm @@ -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 + #include #include "ios/web/navigation/nscoder_util.h" diff --git a/ios/web/navigation/nscoder_util_unittest.mm b/ios/web/navigation/nscoder_util_unittest.mm index 8d3b667e618759..25b84e57329695 100644 --- a/ios/web/navigation/nscoder_util_unittest.mm +++ b/ios/web/navigation/nscoder_util_unittest.mm @@ -3,9 +3,10 @@ // found in the LICENSE file. #import +#include -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ios/web/navigation/nscoder_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/ios/web/net/cert_store_impl.h b/ios/web/net/cert_store_impl.h index 84306edfe63a51..d4da2f286c525f 100644 --- a/ios/web/net/cert_store_impl.h +++ b/ios/web/net/cert_store_impl.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_NET_CERT_STORE_IMPL_H_ #define IOS_WEB_NET_CERT_STORE_IMPL_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "ios/web/net/request_tracker_data_memoizing_store.h" #include "ios/web/public/cert_store.h" diff --git a/ios/web/net/clients/crw_csp_network_client.mm b/ios/web/net/clients/crw_csp_network_client.mm index 8d8d5db59c4b32..2f2a72c528371a 100644 --- a/ios/web/net/clients/crw_csp_network_client.mm +++ b/ios/web/net/clients/crw_csp_network_client.mm @@ -5,9 +5,11 @@ #import "ios/web/net/clients/crw_csp_network_client.h" #import +#include #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "ios/web/net/crw_url_verifying_protocol_handler.h" namespace { diff --git a/ios/web/net/clients/crw_js_injection_network_client.mm b/ios/web/net/clients/crw_js_injection_network_client.mm index 832e760e5f5738..32c49abeb93aeb 100644 --- a/ios/web/net/clients/crw_js_injection_network_client.mm +++ b/ios/web/net/clients/crw_js_injection_network_client.mm @@ -4,6 +4,9 @@ #import "ios/web/net/clients/crw_js_injection_network_client.h" +#include +#include + #include "base/logging.h" #include "base/mac/objc_property_releaser.h" #include "base/mac/scoped_nsobject.h" @@ -361,7 +364,7 @@ - (void)sendInjectedResponseIfNeeded { if (!dataLength) return; - const uint8* bytes = reinterpret_cast([firstData bytes]); + const uint8_t* bytes = reinterpret_cast([firstData bytes]); // Construct one data in which to send the content + injected script tag. base::scoped_nsobject combined([[NSMutableData alloc] init]); @@ -461,7 +464,7 @@ - (void)checkForByteOrderMark { // Do the same check that WebKit does for the byte order mark (BOM), which // must be right at the beginning of the content to be accepted. // Info on byte order mark: http://en.wikipedia.org/wiki/Byte_order_mark - const uint8* bytes = reinterpret_cast([firstData bytes]); + const uint8_t* bytes = reinterpret_cast([firstData bytes]); if (BytesEqual(bytes, 0xFF, 0xFE)) { bytes += 2; @@ -522,7 +525,7 @@ - (void)checkForXMLDeclaration { // is not exactly clear about what, if anything, can appear before an XML // declaration. Can there be white space? Can there be comments? WebKit only // accepts XML declarations if they are right at the beginning of the content. - const uint8* bytes = reinterpret_cast([firstData bytes]); + const uint8_t* bytes = reinterpret_cast([firstData bytes]); if (BytesEqual(bytes, '<', '?', 'x', 'm', 'l')) { _contentEncoding = NSISOLatin1StringEncoding; } else if (BytesEqual(bytes, '<', 0, '?', 0, 'x', 0)) { @@ -565,7 +568,7 @@ - (void)checkForWhereToInject { NSData* firstData = [_pendingData firstObject]; DCHECK([firstData length] >= kMinimumBytesNeededForHTMLTag); - const uint8* bytes8 = reinterpret_cast([firstData bytes]); + const uint8_t* bytes8 = reinterpret_cast([firstData bytes]); WebCore::CharacterProvider provider; switch (_contentEncoding) { @@ -573,8 +576,8 @@ - (void)checkForWhereToInject { case NSUTF16LittleEndianStringEncoding: case NSUTF32BigEndianStringEncoding: case NSUTF32LittleEndianStringEncoding: { - const uint16* bytes16 = - reinterpret_cast(bytes8 + _headerLength); + const uint16_t* bytes16 = + reinterpret_cast(bytes8 + _headerLength); provider.setContents(bytes16, [firstData length] - _headerLength); diff --git a/ios/web/net/cookie_notification_bridge.h b/ios/web/net/cookie_notification_bridge.h index c255faa0881bf7..66fbef85f88e47 100644 --- a/ios/web/net/cookie_notification_bridge.h +++ b/ios/web/net/cookie_notification_bridge.h @@ -6,6 +6,7 @@ #define IOS_WEB_NET_COOKIE_NOTIFICATION_BRIDGE_H_ #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" @class NSNotification; diff --git a/ios/web/net/request_group_util_unittest.mm b/ios/web/net/request_group_util_unittest.mm index b21e30e58133bd..4ce3221488cbd3 100644 --- a/ios/web/net/request_group_util_unittest.mm +++ b/ios/web/net/request_group_util_unittest.mm @@ -5,6 +5,7 @@ #include "ios/web/net/request_group_util.h" #include +#include #include "base/mac/scoped_nsobject.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/web/net/request_tracker_impl.h b/ios/web/net/request_tracker_impl.h index 45aaa0361b195c..75f3640fb9bc81 100644 --- a/ios/web/net/request_tracker_impl.h +++ b/ios/web/net/request_tracker_impl.h @@ -6,6 +6,7 @@ #define IOS_WEB_NET_REQUEST_TRACKER_IMPL_H_ #import +#include #include #include diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm index c96930b2a64413..88afc0fd08a341 100644 --- a/ios/web/net/request_tracker_impl.mm +++ b/ios/web/net/request_tracker_impl.mm @@ -5,12 +5,15 @@ #include "ios/web/net/request_tracker_impl.h" #include +#include +#include #include "base/containers/hash_tables.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/bind_objc_block.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" diff --git a/ios/web/net/request_tracker_impl_unittest.mm b/ios/web/net/request_tracker_impl_unittest.mm index 5765b3abb33ff3..7f843175269c8b 100644 --- a/ios/web/net/request_tracker_impl_unittest.mm +++ b/ios/web/net/request_tracker_impl_unittest.mm @@ -4,6 +4,8 @@ #include "ios/web/net/request_tracker_impl.h" +#include + #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #include "base/macros.h" diff --git a/ios/web/net/web_http_protocol_handler_delegate_unittest.mm b/ios/web/net/web_http_protocol_handler_delegate_unittest.mm index 1233f33b883df4..66fa878d71b3a1 100644 --- a/ios/web/net/web_http_protocol_handler_delegate_unittest.mm +++ b/ios/web/net/web_http_protocol_handler_delegate_unittest.mm @@ -7,6 +7,7 @@ #import #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/thread_task_runner_handle.h" diff --git a/ios/web/public/app/web_main_parts.h b/ios/web/public/app/web_main_parts.h index edb2b23cd3676b..43ad8d52605a7e 100644 --- a/ios/web/public/app/web_main_parts.h +++ b/ios/web/public/app/web_main_parts.h @@ -5,7 +5,6 @@ #ifndef IOS_WEB_PUBLIC_APP_WEB_MAIN_PARTS_H_ #define IOS_WEB_PUBLIC_APP_WEB_MAIN_PARTS_H_ -#include "base/basictypes.h" namespace web { diff --git a/ios/web/public/certificate_policy_cache.h b/ios/web/public/certificate_policy_cache.h index 51d5d4be26a54c..6900a1748a06eb 100644 --- a/ios/web/public/certificate_policy_cache.h +++ b/ios/web/public/certificate_policy_cache.h @@ -8,6 +8,7 @@ #include #include +#include "base/macros.h" #include "ios/web/public/cert_policy.h" #include "net/cert/x509_certificate.h" diff --git a/ios/web/public/navigation_manager.h b/ios/web/public/navigation_manager.h index 345ef4b8db3bd7..11f1f9d4e80644 100644 --- a/ios/web/public/navigation_manager.h +++ b/ios/web/public/navigation_manager.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_NAVIGATION_MANAGER_H_ #define IOS_WEB_PUBLIC_NAVIGATION_MANAGER_H_ +#include + #include "ios/web/public/browser_url_rewriter.h" namespace web { diff --git a/ios/web/public/referrer_util_unittest.cc b/ios/web/public/referrer_util_unittest.cc index 07c988aca1d982..0f5f75f8747c0e 100644 --- a/ios/web/public/referrer_util_unittest.cc +++ b/ios/web/public/referrer_util_unittest.cc @@ -4,6 +4,7 @@ #include "ios/web/public/referrer_util.h" +#include "base/macros.h" #include "ios/web/public/referrer.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/ios/web/public/string_util.h b/ios/web/public/string_util.h index b5b23b3897442f..737b913f3dbb35 100644 --- a/ios/web/public/string_util.h +++ b/ios/web/public/string_util.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_STRING_UTIL_H_ #define IOS_WEB_PUBLIC_STRING_UTIL_H_ +#include + #include "base/strings/string16.h" namespace web { diff --git a/ios/web/public/test/http_server.h b/ios/web/public/test/http_server.h index cacc5f1e10ff83..bc96a1fc03dbb4 100644 --- a/ios/web/public/test/http_server.h +++ b/ios/web/public/test/http_server.h @@ -8,6 +8,7 @@ #include #import "base/mac/scoped_nsobject.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/ios/web/public/test/response_providers/response_provider.h b/ios/web/public/test/response_providers/response_provider.h index dbf73ac47bd3aa..e9a96e1057de9d 100644 --- a/ios/web/public/test/response_providers/response_provider.h +++ b/ios/web/public/test/response_providers/response_provider.h @@ -7,6 +7,7 @@ #include +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" diff --git a/ios/web/public/test/test_web_state.cc b/ios/web/public/test/test_web_state.cc index a06498261e99cd..9fddf3e0eb9253 100644 --- a/ios/web/public/test/test_web_state.cc +++ b/ios/web/public/test/test_web_state.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 + #include "ios/web/public/test/test_web_state.h" namespace web { diff --git a/ios/web/public/test/test_web_state.h b/ios/web/public/test/test_web_state.h index 69e0f64c3bc130..b189298dc8a17e 100644 --- a/ios/web/public/test/test_web_state.h +++ b/ios/web/public/test/test_web_state.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_TEST_TEST_WEB_STATE_H_ #define IOS_WEB_PUBLIC_TEST_TEST_WEB_STATE_H_ +#include + #include #include "base/strings/string16.h" diff --git a/ios/web/public/user_agent.mm b/ios/web/public/user_agent.mm index d930fb78e7e8a0..722c25eb7049bf 100644 --- a/ios/web/public/user_agent.mm +++ b/ios/web/public/user_agent.mm @@ -6,10 +6,13 @@ #import +#include +#include #include #include #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" @@ -23,8 +26,8 @@ }; struct OSVersionMap { - int32 major_os_version; - int32 minor_os_version; + int32_t major_os_version; + int32_t minor_os_version; UAVersions ua_versions; }; @@ -39,9 +42,9 @@ {7, 0, {"9537.53", "537.51.1"}}, }; - 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); @@ -63,9 +66,9 @@ namespace web { std::string BuildOSCpuInfo() { - 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/ios/web/public/web_state/global_web_state_observer.h b/ios/web/public/web_state/global_web_state_observer.h index 3a66c0d81ec80a..53c973a20c56db 100644 --- a/ios/web/public/web_state/global_web_state_observer.h +++ b/ios/web/public/web_state/global_web_state_observer.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_WEB_STATE_GLOBAL_WEB_STATE_OBSERVER_H_ #define IOS_WEB_PUBLIC_WEB_STATE_GLOBAL_WEB_STATE_OBSERVER_H_ +#include + #include "base/macros.h" #include "ios/web/public/web_state/web_state_observer.h" diff --git a/ios/web/public/web_state/ui/crw_web_delegate.h b/ios/web/public/web_state/ui/crw_web_delegate.h index d249a38c071f5e..a5821b348bee29 100644 --- a/ios/web/public/web_state/ui/crw_web_delegate.h +++ b/ios/web/public/web_state/ui/crw_web_delegate.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_WEB_DELEGATE_H_ #define IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_WEB_DELEGATE_H_ +#include #import #include diff --git a/ios/web/public/web_state/web_state.h b/ios/web/public/web_state/web_state.h index 4f782ad4778e32..8668eb85d744d3 100644 --- a/ios/web/public/web_state/web_state.h +++ b/ios/web/public/web_state/web_state.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_H_ #define IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_H_ +#include + #include #include diff --git a/ios/web/public/web_state/web_state_observer.h b/ios/web/public/web_state/web_state_observer.h index 9be1ce0319ec57..c56dde4f28d232 100644 --- a/ios/web/public/web_state/web_state_observer.h +++ b/ios/web/public/web_state/web_state_observer.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_OBSERVER_H_ #define IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_OBSERVER_H_ +#include + #include #include diff --git a/ios/web/public/web_state/web_state_observer_bridge.h b/ios/web/public/web_state/web_state_observer_bridge.h index 7103af6daeba9f..2a689f4434f410 100644 --- a/ios/web/public/web_state/web_state_observer_bridge.h +++ b/ios/web/public/web_state/web_state_observer_bridge.h @@ -10,6 +10,7 @@ #include #import "base/ios/weak_nsobject.h" +#include "base/macros.h" #import "ios/web/public/web_state/web_state_observer.h" class GURL; diff --git a/ios/web/shell/shell_main_delegate.h b/ios/web/shell/shell_main_delegate.h index 1bfd9bdf14d741..7f07f633ec54ec 100644 --- a/ios/web/shell/shell_main_delegate.h +++ b/ios/web/shell/shell_main_delegate.h @@ -5,7 +5,6 @@ #ifndef IOS_WEB_SHELL_SHELL_MAIN_DELEGATE_H_ #define IOS_WEB_SHELL_SHELL_MAIN_DELEGATE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ios/web/public/app/web_main_delegate.h" diff --git a/ios/web/shell/shell_network_delegate.h b/ios/web/shell/shell_network_delegate.h index 906c4952310102..5204e68f93469e 100644 --- a/ios/web/shell/shell_network_delegate.h +++ b/ios/web/shell/shell_network_delegate.h @@ -5,8 +5,8 @@ #ifndef IOS_WEB_SHELL_SHELL_NETWORK_DELEGATE_H_ #define IOS_WEB_SHELL_SHELL_NETWORK_DELEGATE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "net/base/network_delegate_impl.h" namespace web { diff --git a/ios/web/shell/shell_url_request_context_getter.h b/ios/web/shell/shell_url_request_context_getter.h index b414426372a26b..2d536765ba48d6 100644 --- a/ios/web/shell/shell_url_request_context_getter.h +++ b/ios/web/shell/shell_url_request_context_getter.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.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/single_thread_task_runner.h" diff --git a/ios/web/shell/shell_web_client.h b/ios/web/shell/shell_web_client.h index 298a5e46fe91fb..85ad1e4939e546 100644 --- a/ios/web/shell/shell_web_client.h +++ b/ios/web/shell/shell_web_client.h @@ -6,6 +6,7 @@ #define IOS_WEB_SHELL_SHELL_WEB_CLIENT_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ios/web/public/web_client.h" diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm index 3d6601d6a62d08..4bd2c1006693e2 100644 --- a/ios/web/shell/view_controller.mm +++ b/ios/web/shell/view_controller.mm @@ -4,6 +4,8 @@ #import "ios/web/shell/view_controller.h" +#include + #include "base/mac/objc_property_releaser.h" #import "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/web/string_util.cc b/ios/web/string_util.cc index a00d023e35e68b..0202285231bba4 100644 --- a/ios/web/string_util.cc +++ b/ios/web/string_util.cc @@ -4,6 +4,8 @@ #include "ios/web/public/string_util.h" +#include + #include "base/strings/string_util.h" namespace web { diff --git a/ios/web/string_util_unittest.cc b/ios/web/string_util_unittest.cc index 4899a92222794e..710adda9565c86 100644 --- a/ios/web/string_util_unittest.cc +++ b/ios/web/string_util_unittest.cc @@ -4,6 +4,8 @@ #include "ios/web/public/string_util.h" +#include + #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/web/test/test_web_thread.cc b/ios/web/test/test_web_thread.cc index 06322bd00b9e05..825a34ed0c44d4 100644 --- a/ios/web/test/test_web_thread.cc +++ b/ios/web/test/test_web_thread.cc @@ -4,6 +4,7 @@ #include "ios/web/public/test/test_web_thread.h" +#include "base/macros.h" #include "ios/web/web_thread_impl.h" namespace web { diff --git a/ios/web/test/web_test_suite.h b/ios/web/test/web_test_suite.h index 5ea67797b3ba5b..738ca4e060f4c9 100644 --- a/ios/web/test/web_test_suite.h +++ b/ios/web/test/web_test_suite.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_TEST_WEB_TEST_SUITE_H_ #define IOS_WEB_TEST_WEB_TEST_SUITE_H_ +#include "base/macros.h" #include "base/test/test_suite.h" namespace web { diff --git a/ios/web/web_state/crw_pass_kit_downloader.mm b/ios/web/web_state/crw_pass_kit_downloader.mm index d988397c83d86a..1b61538bb02775 100644 --- a/ios/web/web_state/crw_pass_kit_downloader.mm +++ b/ios/web/web_state/crw_pass_kit_downloader.mm @@ -6,6 +6,7 @@ #import "base/ios/weak_nsobject.h" #include "base/mac/scoped_block.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/strings/sys_string_conversions.h" diff --git a/ios/web/web_state/global_web_state_event_tracker.cc b/ios/web/web_state/global_web_state_event_tracker.cc index 303f8940d3526b..9a51bf5f039271 100644 --- a/ios/web/web_state/global_web_state_event_tracker.cc +++ b/ios/web/web_state/global_web_state_event_tracker.cc @@ -4,6 +4,9 @@ #include "ios/web/web_state/global_web_state_event_tracker.h" +#include + +#include "base/macros.h" #include "base/memory/singleton.h" #include "ios/web/public/web_state/web_state_observer.h" #include "ios/web/public/web_state/web_state_user_data.h" diff --git a/ios/web/web_state/global_web_state_event_tracker.h b/ios/web/web_state/global_web_state_event_tracker.h index c37f08f25ca7d0..19c15e09d790b1 100644 --- a/ios/web/web_state/global_web_state_event_tracker.h +++ b/ios/web/web_state/global_web_state_event_tracker.h @@ -5,6 +5,8 @@ #ifndef IOS_WEB_WEB_STATE_GLOBAL_WEB_STATE_EVENT_TRACKER_H_ #define IOS_WEB_WEB_STATE_GLOBAL_WEB_STATE_EVENT_TRACKER_H_ +#include + #include "base/macros.h" #include "base/observer_list.h" #include "ios/web/public/web_state/global_web_state_observer.h" diff --git a/ios/web/web_state/js/common_js_unittest.mm b/ios/web/web_state/js/common_js_unittest.mm index 1947b69fc2d039..4227e4e789cdc1 100644 --- a/ios/web/web_state/js/common_js_unittest.mm +++ b/ios/web/web_state/js/common_js_unittest.mm @@ -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 #import +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "ios/web/public/test/web_test_util.h" diff --git a/ios/web/web_state/js/core_js_unittest.mm b/ios/web/web_state/js/core_js_unittest.mm index 443158b5a7a88c..f4d1751335c78c 100644 --- a/ios/web/web_state/js/core_js_unittest.mm +++ b/ios/web/web_state/js/core_js_unittest.mm @@ -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 #import #include +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "ios/web/public/test/web_test_util.h" #import "ios/web/test/web_test.h" diff --git a/ios/web/web_state/js/crw_js_injection_manager_unittest.mm b/ios/web/web_state/js/crw_js_injection_manager_unittest.mm index 83297a8c74e386..dfc635abbfca69 100644 --- a/ios/web/web_state/js/crw_js_injection_manager_unittest.mm +++ b/ios/web/web_state/js/crw_js_injection_manager_unittest.mm @@ -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 #import #include "ios/web/public/test/web_test_util.h" diff --git a/ios/web/web_state/ui/crw_ui_web_view_web_controller.h b/ios/web/web_state/ui/crw_ui_web_view_web_controller.h index 1cc981f646f25b..a007662b5eb820 100644 --- a/ios/web/web_state/ui/crw_ui_web_view_web_controller.h +++ b/ios/web/web_state/ui/crw_ui_web_view_web_controller.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_WEB_STATE_UI_CRW_UI_WEB_VIEW_WEB_CONTROLLER_H_ #define IOS_WEB_WEB_STATE_UI_CRW_UI_WEB_VIEW_WEB_CONTROLLER_H_ +#include #import #import "ios/web/web_state/crw_recurring_task_delegate.h" @@ -13,8 +14,8 @@ namespace web { // Continuous JavaScript check timer frequency constants (exposed for tests). -extern const int64 kContinuousCheckIntervalMSHigh; -extern const int64 kContinuousCheckIntervalMSLow; +extern const int64_t kContinuousCheckIntervalMSHigh; +extern const int64_t kContinuousCheckIntervalMSLow; } // namespace web diff --git a/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm b/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm index 587508a1ce7498..03549b249ce643 100644 --- a/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm +++ b/ios/web/web_state/ui/crw_ui_web_view_web_controller.mm @@ -4,6 +4,9 @@ #import "ios/web/web_state/ui/crw_ui_web_view_web_controller.h" +#include +#include + #import "base/ios/ios_util.h" #import "base/ios/ns_error_util.h" #import "base/ios/weak_nsobject.h" @@ -11,6 +14,7 @@ #include "base/json/string_escape.h" #include "base/mac/bind_objc_block.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" @@ -46,17 +50,17 @@ // available for the purpose of performance tests. // Frequency for the continuous checks when a reset in the page object is // anticipated shortly. In milliseconds. -const int64 kContinuousCheckIntervalMSHigh = 100; +const int64_t kContinuousCheckIntervalMSHigh = 100; // The maximum duration that the CRWWebController can run in high-frequency // check mode before being changed back to the low frequency. -const int64 kContinuousCheckHighFrequencyMSMaxDuration = 5000; +const int64_t kContinuousCheckHighFrequencyMSMaxDuration = 5000; // Frequency for the continuous checks when a reset in the page object is not // anticipated; checks are only made as a precaution. // The URL could be out of date for this many milliseconds, so this should not // be increased without careful consideration. -const int64 kContinuousCheckIntervalMSLow = 3000; +const int64_t kContinuousCheckIntervalMSLow = 3000; } // namespace web diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm index 5a5694f55a4c4d..c5261dfe85f33e 100644 --- a/ios/web/web_state/ui/crw_web_controller.mm +++ b/ios/web/web_state/ui/crw_web_controller.mm @@ -5,6 +5,7 @@ #import "ios/web/web_state/ui/crw_web_controller.h" #import +#include #include #include "base/ios/block_types.h" diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm index 4a277cc415eb5c..690129c584f45d 100644 --- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm +++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm @@ -4,6 +4,7 @@ #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h" +#include #import #include "base/containers/mru_cache.h" diff --git a/ios/web/web_state/web_controller_observer_bridge.h b/ios/web/web_state/web_controller_observer_bridge.h index b1cd2f0f98ce3f..1602c7745e7904 100644 --- a/ios/web/web_state/web_controller_observer_bridge.h +++ b/ios/web/web_state/web_controller_observer_bridge.h @@ -8,6 +8,7 @@ #include #import "base/ios/weak_nsobject.h" +#include "base/macros.h" #include "ios/web/public/web_state/web_state_observer.h" @class CRWWebController; diff --git a/ios/web/web_state/web_state_impl.h b/ios/web/web_state/web_state_impl.h index b1b5cea6e667a1..cf4ae71c344802 100644 --- a/ios/web/web_state/web_state_impl.h +++ b/ios/web/web_state/web_state_impl.h @@ -5,10 +5,14 @@ #ifndef IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_ #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_ +#include +#include + #include #include #include +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" diff --git a/ios/web/web_state/web_state_impl.mm b/ios/web/web_state/web_state_impl.mm index 714539c00f53e9..c5de402c8a532a 100644 --- a/ios/web/web_state/web_state_impl.mm +++ b/ios/web/web_state/web_state_impl.mm @@ -4,6 +4,9 @@ #include "ios/web/web_state/web_state_impl.h" +#include +#include + #include "base/strings/sys_string_conversions.h" #include "ios/web/interstitials/web_interstitial_impl.h" #import "ios/web/navigation/crw_session_controller.h" diff --git a/ios/web/web_state/web_state_impl_unittest.mm b/ios/web/web_state/web_state_impl_unittest.mm index 1c13c781e0beda..15bef0a1d05268 100644 --- a/ios/web/web_state/web_state_impl_unittest.mm +++ b/ios/web/web_state/web_state_impl_unittest.mm @@ -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 + #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/ios/web/web_thread_impl.cc b/ios/web/web_thread_impl.cc index 7b69285f9ac3a5..77ff7ac0ea277a 100644 --- a/ios/web/web_thread_impl.cc +++ b/ios/web/web_thread_impl.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/ios/web/web_view_counter_impl.h b/ios/web/web_view_counter_impl.h index 3b48cc9f651107..34d1f02344aabb 100644 --- a/ios/web/web_view_counter_impl.h +++ b/ios/web/web_view_counter_impl.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_WEB_VIEW_COUNTER_IMPL_H_ #define IOS_WEB_WEB_VIEW_COUNTER_IMPL_H_ +#include #import #include "base/macros.h" diff --git a/ios/web/web_view_counter_impl.mm b/ios/web/web_view_counter_impl.mm index cd6b825ba4e0c2..74b3869fb9756f 100644 --- a/ios/web/web_view_counter_impl.mm +++ b/ios/web/web_view_counter_impl.mm @@ -4,6 +4,8 @@ #import "ios/web/web_view_counter_impl.h" +#include + #include "base/logging.h" #include "ios/web/public/browser_state.h" #include "ios/web/public/web_thread.h" diff --git a/ios/web/web_view_creation_util.mm b/ios/web/web_view_creation_util.mm index cd8bc22eb45c38..08721c3644be29 100644 --- a/ios/web/web_view_creation_util.mm +++ b/ios/web/web_view_creation_util.mm @@ -5,6 +5,8 @@ #include "ios/web/public/web_view_creation_util.h" #include +#include +#include #include #include "base/ios/ios_util.h" diff --git a/ios/web/webui/shared_resources_data_source_ios.cc b/ios/web/webui/shared_resources_data_source_ios.cc index 434a5a69db2a98..b760ca813aaaf2 100644 --- a/ios/web/webui/shared_resources_data_source_ios.cc +++ b/ios/web/webui/shared_resources_data_source_ios.cc @@ -4,6 +4,8 @@ #include "ios/web/webui/shared_resources_data_source_ios.h" +#include + #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" diff --git a/ios/web/webui/shared_resources_data_source_ios.h b/ios/web/webui/shared_resources_data_source_ios.h index 92fa4fd217e8e6..47394e65497507 100644 --- a/ios/web/webui/shared_resources_data_source_ios.h +++ b/ios/web/webui/shared_resources_data_source_ios.h @@ -5,8 +5,8 @@ #ifndef IOS_WEB_WEBUI_SHARED_RESOURCES_DATA_SOURCE_IOS_H_ #define IOS_WEB_WEBUI_SHARED_RESOURCES_DATA_SOURCE_IOS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ios/web/public/url_data_source_ios.h" namespace web { diff --git a/ios/web/webui/url_data_manager_ios.cc b/ios/web/webui/url_data_manager_ios.cc index 60483166410d77..1b67ba2986b9a9 100644 --- a/ios/web/webui/url_data_manager_ios.cc +++ b/ios/web/webui/url_data_manager_ios.cc @@ -4,6 +4,8 @@ #include "ios/web/webui/url_data_manager_ios.h" +#include + #include #include "base/bind.h" diff --git a/ios/web/webui/url_data_manager_ios.h b/ios/web/webui/url_data_manager_ios.h index c23eda524aecb8..c76b410aef094d 100644 --- a/ios/web/webui/url_data_manager_ios.h +++ b/ios/web/webui/url_data_manager_ios.h @@ -8,6 +8,7 @@ #include #include +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/supports_user_data.h" diff --git a/ios/web/webui/url_data_manager_ios_backend.cc b/ios/web/webui/url_data_manager_ios_backend.cc index d5117c27f13c2f..5b5e80fe14f0b9 100644 --- a/ios/web/webui/url_data_manager_ios_backend.cc +++ b/ios/web/webui/url_data_manager_ios_backend.cc @@ -6,12 +6,12 @@ #include -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" diff --git a/ios/web/webui/url_data_manager_ios_backend.h b/ios/web/webui/url_data_manager_ios_backend.h index 1ad5c844572f30..3b6ea171175c72 100644 --- a/ios/web/webui/url_data_manager_ios_backend.h +++ b/ios/web/webui/url_data_manager_ios_backend.h @@ -9,8 +9,8 @@ #include #include -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/supports_user_data.h" #include "ios/web/public/url_data_source_ios.h" #include "ios/web/webui/url_data_manager_ios.h" diff --git a/ios/web/webui/web_ui_ios_controller_factory_registry.cc b/ios/web/webui/web_ui_ios_controller_factory_registry.cc index 629d20d1bf7c06..601bced61ca838 100644 --- a/ios/web/webui/web_ui_ios_controller_factory_registry.cc +++ b/ios/web/webui/web_ui_ios_controller_factory_registry.cc @@ -4,6 +4,8 @@ #include "ios/web/webui/web_ui_ios_controller_factory_registry.h" +#include + #include "base/lazy_instance.h" #include "url/gurl.h" #include "url/url_constants.h" diff --git a/ios/web/webui/web_ui_ios_controller_factory_registry.h b/ios/web/webui/web_ui_ios_controller_factory_registry.h index 819b0c34537a93..d8118f1f6c9fa4 100644 --- a/ios/web/webui/web_ui_ios_controller_factory_registry.h +++ b/ios/web/webui/web_ui_ios_controller_factory_registry.h @@ -5,6 +5,7 @@ #ifndef IOS_WEB_WEBUI_WEB_UI_IOS_CONTROLLER_FACTORY_REGISTRY_H_ #define IOS_WEB_WEBUI_WEB_UI_IOS_CONTROLLER_FACTORY_REGISTRY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "ios/public/provider/web/web_ui_ios_controller_factory.h" diff --git a/ios/web/webui/web_ui_ios_data_source_impl.h b/ios/web/webui/web_ui_ios_data_source_impl.h index 03f1b1d48250fe..dc3cae925e0887 100644 --- a/ios/web/webui/web_ui_ios_data_source_impl.h +++ b/ios/web/webui/web_ui_ios_data_source_impl.h @@ -8,9 +8,9 @@ #include #include -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "ios/web/public/url_data_source_ios.h" #include "ios/web/public/web_ui_ios_data_source.h" diff --git a/ios/web/webui/web_ui_ios_impl.h b/ios/web/webui/web_ui_ios_impl.h index 20b0fc3ef734cc..d307b08ac4b6ab 100644 --- a/ios/web/webui/web_ui_ios_impl.h +++ b/ios/web/webui/web_ui_ios_impl.h @@ -8,6 +8,7 @@ #include #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "ios/public/provider/web/web_ui_ios.h" diff --git a/ios/web/webui/web_ui_ios_impl.mm b/ios/web/webui/web_ui_ios_impl.mm index 8913f79d7547d9..4ef9fdf0d3f976 100644 --- a/ios/web/webui/web_ui_ios_impl.mm +++ b/ios/web/webui/web_ui_ios_impl.mm @@ -4,6 +4,8 @@ #include "ios/web/webui/web_ui_ios_impl.h" +#include + #include "base/json/json_writer.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"