diff options
Diffstat (limited to 'components/autofill/core/browser')
94 files changed, 212 insertions, 74 deletions
diff --git a/components/autofill/core/browser/address.cc b/components/autofill/core/browser/address.cc index e0c2a9c..5393c6b 100644 --- a/components/autofill/core/browser/address.cc +++ b/components/autofill/core/browser/address.cc @@ -7,7 +7,6 @@ #include <stddef.h> #include <algorithm> -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/address_field.h b/components/autofill/core/browser/address_field.h index 721545e..5a4ae9c 100644 --- a/components/autofill/core/browser/address_field.h +++ b/components/autofill/core/browser/address_field.h @@ -7,9 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/autofill/core/browser/autofill_type.h" diff --git a/components/autofill/core/browser/address_field_unittest.cc b/components/autofill/core/browser/address_field_unittest.cc index b8f27ad..7293f7a 100644 --- a/components/autofill/core/browser/address_field_unittest.cc +++ b/components/autofill/core/browser/address_field_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string16.h" diff --git a/components/autofill/core/browser/address_i18n_unittest.cc b/components/autofill/core/browser/address_i18n_unittest.cc index d360b1d..288ea04 100644 --- a/components/autofill/core/browser/address_i18n_unittest.cc +++ b/components/autofill/core/browser/address_i18n_unittest.cc @@ -4,10 +4,13 @@ #include "components/autofill/core/browser/address_i18n.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/guid.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/autofill_test_utils.h" diff --git a/components/autofill/core/browser/address_unittest.cc b/components/autofill/core/browser/address_unittest.cc index 9a845e8..d728dbf 100644 --- a/components/autofill/core/browser/address_unittest.cc +++ b/components/autofill/core/browser/address_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/core/browser/address.h" diff --git a/components/autofill/core/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h index 58012bb..b76f10a 100644 --- a/components/autofill/core/browser/autocomplete_history_manager.h +++ b/components/autofill/core/browser/autocomplete_history_manager.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/webdata/common/web_data_service_consumer.h" diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc index 07aae3d..095f13a 100644 --- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc @@ -4,6 +4,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" diff --git a/components/autofill/core/browser/autofill_cc_infobar_delegate.cc b/components/autofill/core/browser/autofill_cc_infobar_delegate.cc index c885143..69f2955 100644 --- a/components/autofill/core/browser/autofill_cc_infobar_delegate.cc +++ b/components/autofill/core/browser/autofill_cc_infobar_delegate.cc @@ -5,6 +5,7 @@ #include "components/autofill/core/browser/autofill_cc_infobar_delegate.h" #include "base/logging.h" +#include "build/build_config.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/common/autofill_constants.h" diff --git a/components/autofill/core/browser/autofill_cc_infobar_delegate.h b/components/autofill/core/browser/autofill_cc_infobar_delegate.h index 7283d9c6..55c6de0 100644 --- a/components/autofill/core/browser/autofill_cc_infobar_delegate.h +++ b/components/autofill/core/browser/autofill_cc_infobar_delegate.h @@ -5,9 +5,9 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CC_INFOBAR_DELEGATE_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CC_INFOBAR_DELEGATE_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/autofill/core/browser/autofill_metrics.h" diff --git a/components/autofill/core/browser/autofill_country.cc b/components/autofill/core/browser/autofill_country.cc index 303a9df..a346d1a 100644 --- a/components/autofill/core/browser/autofill_country.cc +++ b/components/autofill/core/browser/autofill_country.cc @@ -10,6 +10,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/stl_util.h" diff --git a/components/autofill/core/browser/autofill_country.h b/components/autofill/core/browser/autofill_country.h index 7b2414f..3489618 100644 --- a/components/autofill/core/browser/autofill_country.h +++ b/components/autofill/core/browser/autofill_country.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace autofill { diff --git a/components/autofill/core/browser/autofill_country_unittest.cc b/components/autofill/core/browser/autofill_country_unittest.cc index fcaf46f6..be24f95 100644 --- a/components/autofill/core/browser/autofill_country_unittest.cc +++ b/components/autofill/core/browser/autofill_country_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include "base/strings/string16.h" diff --git a/components/autofill/core/browser/autofill_data_model.h b/components/autofill/core/browser/autofill_data_model.h index f6b727b..ee055ff 100644 --- a/components/autofill/core/browser/autofill_data_model.h +++ b/components/autofill/core/browser/autofill_data_model.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DATA_MODEL_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DATA_MODEL_H_ +#include <stddef.h> + #include <string> #include "base/strings/string16.h" diff --git a/components/autofill/core/browser/autofill_data_model_unittest.cc b/components/autofill/core/browser/autofill_data_model_unittest.cc index 0adfaa6..4434016 100644 --- a/components/autofill/core/browser/autofill_data_model_unittest.cc +++ b/components/autofill/core/browser/autofill_data_model_unittest.cc @@ -4,7 +4,10 @@ #include "components/autofill/core/browser/autofill_data_model.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/autofill/core/browser/autofill_download_manager_unittest.cc b/components/autofill/core/browser/autofill_download_manager_unittest.cc index fc8831f..c9a27e6 100644 --- a/components/autofill/core/browser/autofill_download_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_download_manager_unittest.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/autofill_download_manager.h" +#include <stddef.h> + #include <list> #include <utility> diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc index 707fda4..7b4f563 100644 --- a/components/autofill/core/browser/autofill_experiments.cc +++ b/components/autofill/core/browser/autofill_experiments.cc @@ -8,6 +8,7 @@ #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc index bec7c5c..25ff585 100644 --- a/components/autofill/core/browser/autofill_external_delegate.cc +++ b/components/autofill/core/browser/autofill_external_delegate.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/autofill_external_delegate.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/case_conversion.h" @@ -13,6 +15,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autocomplete_history_manager.h" #include "components/autofill/core/browser/autofill_driver.h" #include "components/autofill/core/browser/autofill_manager.h" diff --git a/components/autofill/core/browser/autofill_external_delegate.h b/components/autofill/core/browser/autofill_external_delegate.h index 24bc816..f880c75 100644 --- a/components/autofill/core/browser/autofill_external_delegate.h +++ b/components/autofill/core/browser/autofill_external_delegate.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "components/autofill/core/browser/autofill_popup_delegate.h" diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc index 1803f34..ee4db91 100644 --- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc +++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc @@ -6,10 +6,12 @@ #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/test/histogram_tester.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_manager.h" #include "components/autofill/core/browser/autofill_metrics.h" #include "components/autofill/core/browser/popup_item_ids.h" diff --git a/components/autofill/core/browser/autofill_field.cc b/components/autofill/core/browser/autofill_field.cc index 5d7da9c..648f4cb 100644 --- a/components/autofill/core/browser/autofill_field.cc +++ b/components/autofill/core/browser/autofill_field.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/autofill_field.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/i18n/string_search.h" #include "base/logging.h" @@ -403,10 +405,9 @@ std::string Hash32Bit(const std::string& str) { std::string hash_bin = base::SHA1HashString(str); DCHECK_EQ(base::kSHA1Length, hash_bin.length()); - uint32 hash32 = ((hash_bin[0] & 0xFF) << 24) | - ((hash_bin[1] & 0xFF) << 16) | - ((hash_bin[2] & 0xFF) << 8) | - (hash_bin[3] & 0xFF); + uint32_t hash32 = ((hash_bin[0] & 0xFF) << 24) | + ((hash_bin[1] & 0xFF) << 16) | ((hash_bin[2] & 0xFF) << 8) | + (hash_bin[3] & 0xFF); return base::UintToString(hash32); } diff --git a/components/autofill/core/browser/autofill_field.h b/components/autofill/core/browser/autofill_field.h index 0c1c81d..9aaf9fc 100644 --- a/components/autofill/core/browser/autofill_field.h +++ b/components/autofill/core/browser/autofill_field.h @@ -5,9 +5,11 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/common/form_field_data.h" diff --git a/components/autofill/core/browser/autofill_field_unittest.cc b/components/autofill/core/browser/autofill_field_unittest.cc index f861d4e..9438532 100644 --- a/components/autofill/core/browser/autofill_field_unittest.cc +++ b/components/autofill/core/browser/autofill_field_unittest.cc @@ -4,6 +4,9 @@ #include "components/autofill/core/browser/autofill_field.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc index 8ccf26c..15874af 100644 --- a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc +++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc @@ -5,13 +5,14 @@ #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" #include <stddef.h> +#include <stdint.h> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/win/registry.h" #include "components/autofill/core/browser/autofill_country.h" @@ -147,7 +148,7 @@ bool ImportSingleFormGroup(const RegKey& key, bool has_non_empty_fields = false; - for (uint32 i = 0; i < key.GetValueCount(); ++i) { + for (uint32_t i = 0; i < key.GetValueCount(); ++i) { std::wstring value_name; if (key.GetValueNameAt(i, &value_name) != ERROR_SUCCESS) continue; diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc index e4c90d7..29bf783 100644 --- a/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc +++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc @@ -4,7 +4,9 @@ #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string16.h" #include "base/win/registry.h" #include "components/autofill/core/browser/autofill_profile.h" diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc index 63058ec..fa77803 100644 --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc @@ -5,6 +5,7 @@ #include "components/autofill/core/browser/autofill_manager.h" #include <stddef.h> +#include <stdint.h> #include <algorithm> #include <limits> @@ -28,6 +29,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autocomplete_history_manager.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_data_model.h" diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h index bb015a3..d0c26d31 100644 --- a/components/autofill/core/browser/autofill_manager.h +++ b/components/autofill/core/browser/autofill_manager.h @@ -10,15 +10,16 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autocomplete_history_manager.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_download_manager.h" diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc index 7829c80..7a5f4a3 100644 --- a/components/autofill/core/browser/autofill_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_manager_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include <vector> #include "base/command_line.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" @@ -20,6 +23,7 @@ #include "base/test/histogram_tester.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autocomplete_history_manager.h" #include "components/autofill/core/browser/autofill_download_manager.h" #include "components/autofill/core/browser/autofill_manager.h" diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc index 44d9023..0592f95 100644 --- a/components/autofill/core/browser/autofill_merge_unittest.cc +++ b/components/autofill/core/browser/autofill_merge_unittest.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h index ddf0ef3..c94f730 100644 --- a/components/autofill/core/browser/autofill_metrics.h +++ b/components/autofill/core/browser/autofill_metrics.h @@ -8,7 +8,7 @@ #include <stddef.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_download_manager.h" #include "components/autofill/core/browser/autofill_profile.h" diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc index 395bcb2..7fa8faa 100644 --- a/components/autofill/core/browser/autofill_metrics_unittest.cc +++ b/components/autofill/core/browser/autofill_metrics_unittest.cc @@ -4,8 +4,11 @@ #include "components/autofill/core/browser/autofill_metrics.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" diff --git a/components/autofill/core/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc index e68f124..b828bb6 100644 --- a/components/autofill/core/browser/autofill_profile.cc +++ b/components/autofill/core/browser/autofill_profile.cc @@ -10,11 +10,11 @@ #include <ostream> #include <set> -#include "base/basictypes.h" #include "base/guid.h" #include "base/i18n/case_conversion.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/sha1.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/autofill_profile_unittest.cc b/components/autofill/core/browser/autofill_profile_unittest.cc index b092feb..2e66768 100644 --- a/components/autofill/core/browser/autofill_profile_unittest.cc +++ b/components/autofill/core/browser/autofill_profile_unittest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/format_macros.h" #include "base/guid.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" diff --git a/components/autofill/core/browser/autofill_scanner.h b/components/autofill/core/browser/autofill_scanner.h index db3f3ba..8a2bceb0e 100644 --- a/components/autofill/core/browser/autofill_scanner.h +++ b/components/autofill/core/browser/autofill_scanner.h @@ -5,9 +5,11 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SCANNER_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SCANNER_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace autofill { diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc index 60da1b8..1d16c24 100644 --- a/components/autofill/core/browser/autofill_test_utils.cc +++ b/components/autofill/core/browser/autofill_test_utils.cc @@ -9,6 +9,7 @@ #include "base/prefs/pref_service_factory.h" #include "base/prefs/testing_pref_store.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_manager.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/credit_card.h" diff --git a/components/autofill/core/browser/autofill_wallet_data_type_controller.h b/components/autofill/core/browser/autofill_wallet_data_type_controller.h index acc6b2c..2b890f8 100644 --- a/components/autofill/core/browser/autofill_wallet_data_type_controller.h +++ b/components/autofill/core/browser/autofill_wallet_data_type_controller.h @@ -5,7 +5,7 @@ #ifndef COMPONENTS_SYNC_DRIVER_GLUE_AUTOFILL_WALLET_DATA_TYPE_CONTROLLER_H_ #define COMPONENTS_SYNC_DRIVER_GLUE_AUTOFILL_WALLET_DATA_TYPE_CONTROLLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "components/sync_driver/non_ui_data_type_controller.h" diff --git a/components/autofill/core/browser/contact_info.cc b/components/autofill/core/browser/contact_info.cc index ccb45cc..9e793b9 100644 --- a/components/autofill/core/browser/contact_info.cc +++ b/components/autofill/core/browser/contact_info.cc @@ -8,8 +8,8 @@ #include <ostream> #include <string> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/contact_info_unittest.cc b/components/autofill/core/browser/contact_info_unittest.cc index 54e0be4..1330e53 100644 --- a/components/autofill/core/browser/contact_info_unittest.cc +++ b/components/autofill/core/browser/contact_info_unittest.cc @@ -4,8 +4,10 @@ #include "components/autofill/core/browser/contact_info.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc index 00593e7..232fca5 100644 --- a/components/autofill/core/browser/credit_card.cc +++ b/components/autofill/core/browser/credit_card.cc @@ -5,14 +5,15 @@ #include "components/autofill/core/browser/credit_card.h" #include <stddef.h> +#include <stdint.h> #include <algorithm> #include <ostream> #include <string> -#include "base/basictypes.h" #include "base/guid.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -20,6 +21,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_field.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/validation.h" diff --git a/components/autofill/core/browser/credit_card.h b/components/autofill/core/browser/credit_card.h index 59c53a4..cb2ab21 100644 --- a/components/autofill/core/browser/credit_card.h +++ b/components/autofill/core/browser/credit_card.h @@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_data_model.h" namespace autofill { diff --git a/components/autofill/core/browser/credit_card_field.h b/components/autofill/core/browser/credit_card_field.h index ddfd3159..ce4ee75 100644 --- a/components/autofill/core/browser/credit_card_field.h +++ b/components/autofill/core/browser/credit_card_field.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/form_field.h" diff --git a/components/autofill/core/browser/credit_card_field_unittest.cc b/components/autofill/core/browser/credit_card_field_unittest.cc index 1297175..83d23c7 100644 --- a/components/autofill/core/browser/credit_card_field_unittest.cc +++ b/components/autofill/core/browser/credit_card_field_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/credit_card_unittest.cc b/components/autofill/core/browser/credit_card_unittest.cc index ae0a296..135d487 100644 --- a/components/autofill/core/browser/credit_card_unittest.cc +++ b/components/autofill/core/browser/credit_card_unittest.cc @@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/guid.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/credit_card.h" diff --git a/components/autofill/core/browser/crypto/rc4_decryptor.h b/components/autofill/core/browser/crypto/rc4_decryptor.h index 095413a..3d24bca 100644 --- a/components/autofill/core/browser/crypto/rc4_decryptor.h +++ b/components/autofill/core/browser/crypto/rc4_decryptor.h @@ -5,8 +5,10 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CRYPTO_RC4_DECRYPTOR_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_CRYPTO_RC4_DECRYPTOR_H_ +#include <stdint.h> +#include <string.h> + #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" namespace autofill { @@ -24,7 +26,7 @@ namespace autofill { class RC4Decryptor { public: explicit RC4Decryptor(wchar_t const* password) { - PrepareKey(reinterpret_cast<const uint8 *>(password), + PrepareKey(reinterpret_cast<const uint8_t*>(password), wcslen(password) * sizeof(wchar_t)); std::wstring data; // First 128 bytes should be spaces. @@ -40,7 +42,7 @@ class RC4Decryptor { memset(buffer.get(), 0, (data.length() + 1) * sizeof(wchar_t)); memcpy(buffer.get(), data.c_str(), data_size); - RunInternal(reinterpret_cast<uint8 *>(buffer.get()), data_size); + RunInternal(reinterpret_cast<uint8_t*>(buffer.get()), data_size); std::wstring result(buffer.get()); @@ -52,26 +54,26 @@ class RC4Decryptor { private: static const int kKeyDataSize = 256; struct Rc4Key { - uint8 state[kKeyDataSize]; - uint8 x; - uint8 y; + uint8_t state[kKeyDataSize]; + uint8_t x; + uint8_t y; }; - void SwapByte(uint8* byte1, uint8* byte2) { - uint8 temp = *byte1; + void SwapByte(uint8_t* byte1, uint8_t* byte2) { + uint8_t temp = *byte1; *byte1 = *byte2; *byte2 = temp; } - void PrepareKey(const uint8 *key_data, int key_data_len) { - uint8 index1 = 0; - uint8 index2 = 0; - uint8* state; + void PrepareKey(const uint8_t* key_data, int key_data_len) { + uint8_t index1 = 0; + uint8_t index2 = 0; + uint8_t* state; short counter; state = &key_.state[0]; for (counter = 0; counter < kKeyDataSize; ++counter) - state[counter] = static_cast<uint8>(counter); + state[counter] = static_cast<uint8_t>(counter); key_.x = key_.y = 0; @@ -82,10 +84,10 @@ class RC4Decryptor { } } - void RunInternal(uint8 *buffer, int buffer_len) { - uint8 x, y; - uint8 xor_index = 0; - uint8* state; + void RunInternal(uint8_t* buffer, int buffer_len) { + uint8_t x, y; + uint8_t xor_index = 0; + uint8_t* state; int counter; x = key_.x; diff --git a/components/autofill/core/browser/data_driven_test.h b/components/autofill/core/browser/data_driven_test.h index de44554..8249916 100644 --- a/components/autofill/core/browser/data_driven_test.h +++ b/components/autofill/core/browser/data_driven_test.h @@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace autofill { diff --git a/components/autofill/core/browser/email_field.h b/components/autofill/core/browser/email_field.h index 5525550..df76387 100644 --- a/components/autofill/core/browser/email_field.h +++ b/components/autofill/core/browser/email_field.h @@ -5,8 +5,8 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_EMAIL_FIELD_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_EMAIL_FIELD_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/form_field.h" diff --git a/components/autofill/core/browser/form_field.h b/components/autofill/core/browser/form_field.h index c27dc08..e56f0ae 100644 --- a/components/autofill/core/browser/form_field.h +++ b/components/autofill/core/browser/form_field.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/autofill/core/browser/field_types.h" diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc index 3232b82..5dbcde1 100644 --- a/components/autofill/core/browser/form_structure.cc +++ b/components/autofill/core/browser/form_structure.cc @@ -4,10 +4,11 @@ #include "components/autofill/core/browser/form_structure.h" +#include <stdint.h> + #include <map> #include <utility> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" @@ -91,7 +92,7 @@ std::string EncodeFieldTypes(const ServerFieldTypeSet& available_field_types) { const size_t kNumBytes = (MAX_VALID_FIELD_TYPE + 0x7) / 8; // Pack the types in |available_field_types| into |bit_field|. - std::vector<uint8> bit_field(kNumBytes, 0); + std::vector<uint8_t> bit_field(kNumBytes, 0); for (const auto& field_type : available_field_types) { // Set the appropriate bit in the field. The bit we set is the one // |field_type| % 8 from the left of the byte. @@ -1060,14 +1061,14 @@ std::string FormStructure::Hash64Bit(const std::string& str) { std::string hash_bin = base::SHA1HashString(str); DCHECK_EQ(base::kSHA1Length, hash_bin.length()); - uint64 hash64 = (((static_cast<uint64>(hash_bin[0])) & 0xFF) << 56) | - (((static_cast<uint64>(hash_bin[1])) & 0xFF) << 48) | - (((static_cast<uint64>(hash_bin[2])) & 0xFF) << 40) | - (((static_cast<uint64>(hash_bin[3])) & 0xFF) << 32) | - (((static_cast<uint64>(hash_bin[4])) & 0xFF) << 24) | - (((static_cast<uint64>(hash_bin[5])) & 0xFF) << 16) | - (((static_cast<uint64>(hash_bin[6])) & 0xFF) << 8) | - ((static_cast<uint64>(hash_bin[7])) & 0xFF); + uint64_t hash64 = (((static_cast<uint64_t>(hash_bin[0])) & 0xFF) << 56) | + (((static_cast<uint64_t>(hash_bin[1])) & 0xFF) << 48) | + (((static_cast<uint64_t>(hash_bin[2])) & 0xFF) << 40) | + (((static_cast<uint64_t>(hash_bin[3])) & 0xFF) << 32) | + (((static_cast<uint64_t>(hash_bin[4])) & 0xFF) << 24) | + (((static_cast<uint64_t>(hash_bin[5])) & 0xFF) << 16) | + (((static_cast<uint64_t>(hash_bin[6])) & 0xFF) << 8) | + ((static_cast<uint64_t>(hash_bin[7])) & 0xFF); return base::Uint64ToString(hash64); } diff --git a/components/autofill/core/browser/form_structure.h b/components/autofill/core/browser/form_structure.h index e96dae8..a646777 100644 --- a/components/autofill/core/browser/form_structure.h +++ b/components/autofill/core/browser/form_structure.h @@ -5,12 +5,15 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_ +#include <stddef.h> + #include <set> #include <string> #include <vector> #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string16.h" diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc index 15e94e0..b424c1a 100644 --- a/components/autofill/core/browser/form_structure_unittest.cc +++ b/components/autofill/core/browser/form_structure_unittest.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/form_structure.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" diff --git a/components/autofill/core/browser/keyboard_accessory_metrics_logger.h b/components/autofill/core/browser/keyboard_accessory_metrics_logger.h index 50f704c..763a164 100644 --- a/components/autofill/core/browser/keyboard_accessory_metrics_logger.h +++ b/components/autofill/core/browser/keyboard_accessory_metrics_logger.h @@ -5,7 +5,6 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_KEYBOARD_ACCESSORY_METRICS_LOGGER_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_KEYBOARD_ACCESSORY_METRICS_LOGGER_H_ -#include "base/basictypes.h" namespace autofill { diff --git a/components/autofill/core/browser/name_field.cc b/components/autofill/core/browser/name_field.cc index 8532de1..27cba7b7 100644 --- a/components/autofill/core/browser/name_field.cc +++ b/components/autofill/core/browser/name_field.cc @@ -4,6 +4,7 @@ #include "components/autofill/core/browser/name_field.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/components/autofill/core/browser/name_field.h b/components/autofill/core/browser/name_field.h index cb82cbb..7fddca6 100644 --- a/components/autofill/core/browser/name_field.h +++ b/components/autofill/core/browser/name_field.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/autofill_field.h" #include "components/autofill/core/browser/form_field.h" diff --git a/components/autofill/core/browser/name_field_unittest.cc b/components/autofill/core/browser/name_field_unittest.cc index 1c34048..f16add0 100644 --- a/components/autofill/core/browser/name_field_unittest.cc +++ b/components/autofill/core/browser/name_field_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/password_generator.cc b/components/autofill/core/browser/password_generator.cc index da4b386..86877fb 100644 --- a/components/autofill/core/browser/password_generator.cc +++ b/components/autofill/core/browser/password_generator.cc @@ -4,10 +4,11 @@ #include "components/autofill/core/browser/password_generator.h" +#include <stddef.h> + #include <algorithm> #include <vector> -#include "base/basictypes.h" #include "base/rand_util.h" #include "base/strings/string_util.h" #include "third_party/fips181/fips181.h" diff --git a/components/autofill/core/browser/password_generator.h b/components/autofill/core/browser/password_generator.h index 4a1f87f..e24058f 100644 --- a/components/autofill/core/browser/password_generator.h +++ b/components/autofill/core/browser/password_generator.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" namespace autofill { diff --git a/components/autofill/core/browser/password_generator_unittest.cc b/components/autofill/core/browser/password_generator_unittest.cc index 6360f8d..eb041a0 100644 --- a/components/autofill/core/browser/password_generator_unittest.cc +++ b/components/autofill/core/browser/password_generator_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <locale> #include "components/autofill/core/browser/password_generator.h" diff --git a/components/autofill/core/browser/payments/payments_client.cc b/components/autofill/core/browser/payments/payments_client.cc index a45b374..2101865 100644 --- a/components/autofill/core/browser/payments/payments_client.cc +++ b/components/autofill/core/browser/payments/payments_client.cc @@ -13,6 +13,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/payments/payments_request.h" diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc index 588382a..bca5e2a 100644 --- a/components/autofill/core/browser/personal_data_manager.cc +++ b/components/autofill/core/browser/personal_data_manager.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/personal_data_manager.h" +#include <stddef.h> + #include <algorithm> #include "base/i18n/case_conversion.h" @@ -13,6 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/address_i18n.h" #include "components/autofill/core/browser/autofill-inl.h" #include "components/autofill/core/browser/autofill_country.h" diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h index 5fe9c4a..c18cf33 100644 --- a/components/autofill/core/browser/personal_data_manager.h +++ b/components/autofill/core/browser/personal_data_manager.h @@ -9,13 +9,14 @@ #include <set> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" #include "base/prefs/pref_member.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/field_types.h" diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc index 3182299..a1eb7ae 100644 --- a/components/autofill/core/browser/personal_data_manager_unittest.cc +++ b/components/autofill/core/browser/personal_data_manager_unittest.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" #include "base/guid.h" @@ -17,6 +18,7 @@ #include "base/synchronization/waitable_event.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_experiments.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/autofill_test_utils.h" diff --git a/components/autofill/core/browser/phone_field.cc b/components/autofill/core/browser/phone_field.cc index 77a8d9f..05e5704 100644 --- a/components/autofill/core/browser/phone_field.cc +++ b/components/autofill/core/browser/phone_field.cc @@ -4,7 +4,10 @@ #include "components/autofill/core/browser/phone_field.h" +#include <string.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/phone_field.h b/components/autofill/core/browser/phone_field.h index d1024a8..03dc4a9 100644 --- a/components/autofill/core/browser/phone_field.h +++ b/components/autofill/core/browser/phone_field.h @@ -5,10 +5,13 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_ +#include <stddef.h> + #include <vector> #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/form_field.h" diff --git a/components/autofill/core/browser/phone_field_unittest.cc b/components/autofill/core/browser/phone_field_unittest.cc index 5b5991b8..200d381 100644 --- a/components/autofill/core/browser/phone_field_unittest.cc +++ b/components/autofill/core/browser/phone_field_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/phone_number.cc b/components/autofill/core/browser/phone_number.cc index 6783677..1952e58 100644 --- a/components/autofill/core/browser/phone_number.cc +++ b/components/autofill/core/browser/phone_number.cc @@ -4,7 +4,6 @@ #include "components/autofill/core/browser/phone_number.h" -#include "base/basictypes.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/phone_number.h b/components/autofill/core/browser/phone_number.h index 128b2f6..8d50d47 100644 --- a/components/autofill/core/browser/phone_number.h +++ b/components/autofill/core/browser/phone_number.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/components/autofill/core/browser/phone_number_i18n.cc b/components/autofill/core/browser/phone_number_i18n.cc index 60cfadd..46f99a5 100644 --- a/components/autofill/core/browser/phone_number_i18n.cc +++ b/components/autofill/core/browser/phone_number_i18n.cc @@ -4,7 +4,6 @@ #include "components/autofill/core/browser/phone_number_i18n.h" -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/phone_number_i18n_unittest.cc b/components/autofill/core/browser/phone_number_i18n_unittest.cc index 2c463cc..3e2ff0a 100644 --- a/components/autofill/core/browser/phone_number_i18n_unittest.cc +++ b/components/autofill/core/browser/phone_number_i18n_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/server_field_types_util.h b/components/autofill/core/browser/server_field_types_util.h index 4f62f51..73cc363 100644 --- a/components/autofill/core/browser/server_field_types_util.h +++ b/components/autofill/core/browser/server_field_types_util.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_SERVER_FIELD_TYPES_UTIL_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_SERVER_FIELD_TYPES_UTIL_H_ +#include <stddef.h> + #include <vector> #include "components/autofill/core/browser/detail_input.h" diff --git a/components/autofill/core/browser/state_names.cc b/components/autofill/core/browser/state_names.cc index de65924..c537041 100644 --- a/components/autofill/core/browser/state_names.cc +++ b/components/autofill/core/browser/state_names.cc @@ -4,7 +4,9 @@ #include "components/autofill/core/browser/state_names.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/test_autofill_client.h b/components/autofill/core/browser/test_autofill_client.h index 11bebc8..8bba3eb 100644 --- a/components/autofill/core/browser/test_autofill_client.h +++ b/components/autofill/core/browser/test_autofill_client.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_client.h" diff --git a/components/autofill/core/browser/test_autofill_driver.h b/components/autofill/core/browser/test_autofill_driver.h index e4598199..6282fa5 100644 --- a/components/autofill/core/browser/test_autofill_driver.h +++ b/components/autofill/core/browser/test_autofill_driver.h @@ -5,8 +5,8 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_DRIVER_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_DRIVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/autofill/core/browser/autofill_driver.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc index 1ac9687..da0fe37 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc +++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc @@ -4,11 +4,14 @@ #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_experiments.h" #include "components/autofill/core/browser/autofill_metrics.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h index df2b8c3..25d8565 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h +++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "components/autofill/core/browser/autofill_client.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc index e0ff1ea..2850629 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc +++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc @@ -4,7 +4,10 @@ #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_view.h b/components/autofill/core/browser/ui/card_unmask_prompt_view.h index 92c8ae5..dbedeab 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_view.h +++ b/components/autofill/core/browser/ui/card_unmask_prompt_view.h @@ -5,6 +5,7 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_UI_CARD_UNMASK_PROMPT_VIEW_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_UI_CARD_UNMASK_PROMPT_VIEW_H_ +#include "base/macros.h" #include "base/strings/string16.h" namespace autofill { diff --git a/components/autofill/core/browser/validation.cc b/components/autofill/core/browser/validation.cc index b4c9567..debe053 100644 --- a/components/autofill/core/browser/validation.cc +++ b/components/autofill/core/browser/validation.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/validation.h" +#include <stddef.h> + #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" diff --git a/components/autofill/core/browser/validation_unittest.cc b/components/autofill/core/browser/validation_unittest.cc index 92e9515..49037f4 100644 --- a/components/autofill/core/browser/validation_unittest.cc +++ b/components/autofill/core/browser/validation_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "components/autofill/core/browser/validation.h" diff --git a/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc b/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc index 9fae65a..9f41f96 100644 --- a/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc +++ b/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h" +#include <stdint.h> + #include "base/location.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/webdata/autocomplete_syncable_service.h b/components/autofill/core/browser/webdata/autocomplete_syncable_service.h index 257cee3..240d3db 100644 --- a/components/autofill/core/browser/webdata/autocomplete_syncable_service.h +++ b/components/autofill/core/browser/webdata/autocomplete_syncable_service.h @@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/supports_user_data.h" diff --git a/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc b/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc index c14c7e3..f811771 100644 --- a/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h index 3158511..5e13080 100644 --- a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h +++ b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h @@ -6,6 +6,7 @@ #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_PROFILE_DATA_TYPE_CONTROLLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/scoped_observer.h" #include "components/autofill/core/browser/personal_data_manager_observer.h" diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc index a149657..e6fccfe 100644 --- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc +++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h" +#include <stddef.h> + #include "base/guid.h" #include "base/location.h" #include "base/logging.h" diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h index f95b879..3c069d9 100644 --- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h +++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/scoped_observer.h" #include "base/supports_user_data.h" diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc index 43286aa..2fb3bd6 100644 --- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/location.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc index 3e400e1..381b5b6 100644 --- a/components/autofill/core/browser/webdata/autofill_table.cc +++ b/components/autofill/core/browser/webdata/autofill_table.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/webdata/autofill_table.h" +#include <stdint.h> + #include <algorithm> #include <cmath> #include <limits> @@ -46,7 +48,7 @@ namespace autofill { namespace { // The period after which autocomplete entries should expire in days. -const int64 kExpirationPeriodInDays = 60; +const int64_t kExpirationPeriodInDays = 60; // Helper struct for AutofillTable::RemoveFormElementsAddedBetween(). // Contains all the necessary fields to update a row in the 'autofill' table. diff --git a/components/autofill/core/browser/webdata/autofill_table.h b/components/autofill/core/browser/webdata/autofill_table.h index 73fcb16..f7cd14b 100644 --- a/components/autofill/core/browser/webdata/autofill_table.h +++ b/components/autofill/core/browser/webdata/autofill_table.h @@ -5,9 +5,12 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_ +#include <stddef.h> + #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/strings/string16.h" #include "components/webdata/common/web_database_table.h" diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc index 9341d5d..8d36d58 100644 --- a/components/autofill/core/browser/webdata/autofill_table_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <tuple> #include <utility> #include <vector> @@ -10,12 +12,14 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/guid.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/autofill_type.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.cc index 1eb673f..11e47dd 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.h" +#include <stddef.h> + #include "base/base64.h" #include "base/bind.h" #include "base/containers/scoped_ptr_hash_map.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc index abc84e0..596d061 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc @@ -4,12 +4,15 @@ #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/base64.h" -#include "base/basictypes.h" #include "base/containers/scoped_ptr_hash_map.h" #include "base/location.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/time/time.h" #include "components/autofill/core/browser/autofill_profile.h" @@ -177,8 +180,8 @@ TEST_F(AutofillWalletMetadataSyncableServiceTest, NoMetadataToReturn) { } AutofillProfile BuildAddress(const std::string& server_id, - int64 use_count, - int64 use_date) { + int64_t use_count, + int64_t use_date) { AutofillProfile profile(AutofillProfile::SERVER_PROFILE, server_id); profile.set_use_count(use_count); profile.set_use_date(base::Time::FromInternalValue(use_date)); @@ -186,8 +189,8 @@ AutofillProfile BuildAddress(const std::string& server_id, } CreditCard BuildCard(const std::string& server_id, - int64 use_count, - int64 use_date) { + int64_t use_count, + int64_t use_date) { CreditCard card(CreditCard::MASKED_SERVER_CARD, server_id); card.set_use_count(use_count); card.set_use_date(base::Time::FromInternalValue(use_date)); @@ -559,8 +562,8 @@ syncer::SyncChange BuildChange( const std::string& sync_tag, sync_pb::WalletMetadataSpecifics::Type metadata_type, const std::string& server_id, - int64 use_count, - int64 use_date) { + int64_t use_count, + int64_t use_date) { sync_pb::EntitySpecifics entity; entity.mutable_wallet_metadata()->set_type(metadata_type); entity.mutable_wallet_metadata()->set_id(server_id); diff --git a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc index 3fed7f6..4b55c28 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc @@ -4,6 +4,8 @@ #include "components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h" +#include <stddef.h> + #include <set> #include "base/logging.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h index 1939564..3a156ac 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h +++ b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h @@ -5,7 +5,7 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WALLET_SYNCABLE_SERVICE_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WALLET_SYNCABLE_SERVICE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/supports_user_data.h" #include "base/threading/thread_checker.h" #include "sync/api/syncable_service.h" diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h index 86932b3..f0bcb63 100644 --- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h +++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h @@ -5,6 +5,7 @@ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_ #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_delete_on_message_loop.h" #include "base/memory/scoped_ptr.h" diff --git a/components/autofill/core/browser/webdata/autofill_webdata_service.h b/components/autofill/core/browser/webdata/autofill_webdata_service.h index fc2761a..a59a35e 100644 --- a/components/autofill/core/browser/webdata/autofill_webdata_service.h +++ b/components/autofill/core/browser/webdata/autofill_webdata_service.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/components/autofill/core/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc index 5f3d80b..26c5b64 100644 --- a/components/autofill/core/browser/webdata/web_data_service_unittest.cc +++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc @@ -5,10 +5,10 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" |