diff options
Diffstat (limited to 'components/omnibox')
68 files changed, 154 insertions, 52 deletions
diff --git a/components/omnibox/browser/answers_cache.h b/components/omnibox/browser/answers_cache.h index e0be238..0f62949 100644 --- a/components/omnibox/browser/answers_cache.h +++ b/components/omnibox/browser/answers_cache.h @@ -5,9 +5,11 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_ANSWERS_CACHE_H_ #define COMPONENTS_OMNIBOX_BROWSER_ANSWERS_CACHE_H_ +#include <stddef.h> + #include <list> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" struct AnswersQueryData { diff --git a/components/omnibox/browser/autocomplete_classifier.h b/components/omnibox/browser/autocomplete_classifier.h index aca4e06..bdb0116 100644 --- a/components/omnibox/browser/autocomplete_classifier.h +++ b/components/omnibox/browser/autocomplete_classifier.h @@ -5,8 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CLASSIFIER_H_ #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CLASSIFIER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc index 5b05b65..f040752 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/autocomplete_controller.h" +#include <stddef.h> + #include <set> #include <string> diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h index c0afef2..3c5795a 100644 --- a/components/omnibox/browser/autocomplete_controller.h +++ b/components/omnibox/browser/autocomplete_controller.h @@ -5,9 +5,9 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_H_ #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "base/time/time.h" diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc index d5e10f5b..57a43a1 100644 --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc @@ -4,6 +4,7 @@ #include "components/omnibox/browser/autocomplete_input.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/omnibox/browser/autocomplete_input.h b/components/omnibox/browser/autocomplete_input.h index 12c317d..38a431c 100644 --- a/components/omnibox/browser/autocomplete_input.h +++ b/components/omnibox/browser/autocomplete_input.h @@ -5,9 +5,10 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_INPUT_H_ #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_INPUT_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" diff --git a/components/omnibox/browser/autocomplete_input_unittest.cc b/components/omnibox/browser/autocomplete_input_unittest.cc index a227f38..b52d6f9 100644 --- a/components/omnibox/browser/autocomplete_input_unittest.cc +++ b/components/omnibox/browser/autocomplete_input_unittest.cc @@ -4,7 +4,9 @@ #include "components/omnibox/browser/autocomplete_input.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc index a980c31..138575c 100644 --- a/components/omnibox/browser/autocomplete_match.cc +++ b/components/omnibox/browser/autocomplete_match.cc @@ -6,6 +6,7 @@ #include "base/i18n/time_formatting.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -13,6 +14,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/omnibox/browser/autocomplete_provider.h" #include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/template_url.h" diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h index 270a2e2..002f224 100644 --- a/components/omnibox/browser/autocomplete_match.h +++ b/components/omnibox/browser/autocomplete_match.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_ #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> diff --git a/components/omnibox/browser/autocomplete_match_type.cc b/components/omnibox/browser/autocomplete_match_type.cc index 597c872..c826f95 100644 --- a/components/omnibox/browser/autocomplete_match_type.cc +++ b/components/omnibox/browser/autocomplete_match_type.cc @@ -2,10 +2,9 @@ // 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 "components/omnibox/browser/autocomplete_match_type.h" -#include "base/basictypes.h" - // static std::string AutocompleteMatchType::ToString(AutocompleteMatchType::Type type) { const char* strings[] = { diff --git a/components/omnibox/browser/autocomplete_match_unittest.cc b/components/omnibox/browser/autocomplete_match_unittest.cc index 7424ba0..b51fda0 100644 --- a/components/omnibox/browser/autocomplete_match_unittest.cc +++ b/components/omnibox/browser/autocomplete_match_unittest.cc @@ -4,7 +4,9 @@ #include "components/omnibox/browser/autocomplete_match.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "components/omnibox/browser/test_scheme_classifier.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/omnibox/browser/autocomplete_provider.h b/components/omnibox/browser/autocomplete_provider.h index 1adb7a1..197962a 100644 --- a/components/omnibox/browser/autocomplete_provider.h +++ b/components/omnibox/browser/autocomplete_provider.h @@ -5,8 +5,10 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "components/metrics/proto/omnibox_event.pb.h" diff --git a/components/omnibox/browser/autocomplete_provider_unittest.cc b/components/omnibox/browser/autocomplete_provider_unittest.cc index edf06f6..545783e 100644 --- a/components/omnibox/browser/autocomplete_provider_unittest.cc +++ b/components/omnibox/browser/autocomplete_provider_unittest.cc @@ -4,9 +4,12 @@ #include "components/omnibox/browser/autocomplete_provider.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" diff --git a/components/omnibox/browser/autocomplete_result.h b/components/omnibox/browser/autocomplete_result.h index d532de6..979d2ec 100644 --- a/components/omnibox/browser/autocomplete_result.h +++ b/components/omnibox/browser/autocomplete_result.h @@ -9,7 +9,8 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/browser/autocomplete_match.h" #include "url/gurl.h" diff --git a/components/omnibox/browser/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc index 0e65669..02eac88 100644 --- a/components/omnibox/browser/autocomplete_result_unittest.cc +++ b/components/omnibox/browser/autocomplete_result_unittest.cc @@ -4,8 +4,11 @@ #include "components/omnibox/browser/autocomplete_result.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/strings/string_number_conversions.h" diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc index f4ec1d1..c6833f6 100644 --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc @@ -4,7 +4,11 @@ #include "components/omnibox/browser/base_search_provider.h" +#include <stddef.h> +#include <stdint.h> + #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/data_use_measurement/core/data_use_user_data.h" @@ -147,7 +151,7 @@ void BaseSearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const { metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back(); new_entry.set_provider(AsOmniboxEventProviderType()); new_entry.set_provider_done(done_); - std::vector<uint32> field_trial_hashes; + std::vector<uint32_t> field_trial_hashes; OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(&field_trial_hashes); for (size_t i = 0; i < field_trial_hashes.size(); ++i) { if (field_trial_triggered_) diff --git a/components/omnibox/browser/base_search_provider.h b/components/omnibox/browser/base_search_provider.h index 6c9355e..3520582 100644 --- a/components/omnibox/browser/base_search_provider.h +++ b/components/omnibox/browser/base_search_provider.h @@ -15,6 +15,7 @@ #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/metrics/proto/omnibox_event.pb.h" diff --git a/components/omnibox/browser/base_search_provider_unittest.cc b/components/omnibox/browser/base_search_provider_unittest.cc index 0800f03..afd1490 100644 --- a/components/omnibox/browser/base_search_provider_unittest.cc +++ b/components/omnibox/browser/base_search_provider_unittest.cc @@ -4,6 +4,7 @@ #include "components/omnibox/browser/base_search_provider.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "components/omnibox/browser/autocomplete_match.h" diff --git a/components/omnibox/browser/bookmark_provider.cc b/components/omnibox/browser/bookmark_provider.cc index fc55713..6c1c3857 100644 --- a/components/omnibox/browser/bookmark_provider.cc +++ b/components/omnibox/browser/bookmark_provider.cc @@ -8,6 +8,7 @@ #include <functional> #include <vector> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/bookmark_provider.h b/components/omnibox/browser/bookmark_provider.h index 98f1a85..72fd13d 100644 --- a/components/omnibox/browser/bookmark_provider.h +++ b/components/omnibox/browser/bookmark_provider.h @@ -5,9 +5,12 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_ +#include <stddef.h> + #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/autocomplete_provider.h" diff --git a/components/omnibox/browser/builtin_provider.cc b/components/omnibox/browser/builtin_provider.cc index 6e3dde6..4c79be6 100644 --- a/components/omnibox/browser/builtin_provider.cc +++ b/components/omnibox/browser/builtin_provider.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/builtin_provider.h" +#include <stddef.h> + #include <algorithm> #include "base/strings/string_util.h" diff --git a/components/omnibox/browser/builtin_provider.h b/components/omnibox/browser/builtin_provider.h index 4c6a9d5..768c9e3 100644 --- a/components/omnibox/browser/builtin_provider.h +++ b/components/omnibox/browser/builtin_provider.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/autocomplete_provider.h" diff --git a/components/omnibox/browser/history_provider.h b/components/omnibox/browser/history_provider.h index a64b0a6..8608927 100644 --- a/components/omnibox/browser/history_provider.h +++ b/components/omnibox/browser/history_provider.h @@ -5,7 +5,10 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_HISTORY_PROVIDER_H_ +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/omnibox/browser/autocomplete_provider.h" #include "components/omnibox/browser/autocomplete_provider_client.h" #include "components/omnibox/browser/in_memory_url_index_types.h" diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc index 122a1f7..9a7774d 100644 --- a/components/omnibox/browser/history_quick_provider.cc +++ b/components/omnibox/browser/history_quick_provider.cc @@ -4,9 +4,10 @@ #include "components/omnibox/browser/history_quick_provider.h" +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/i18n/break_iterator.h" #include "base/logging.h" #include "base/metrics/field_trial.h" diff --git a/components/omnibox/browser/history_quick_provider.h b/components/omnibox/browser/history_quick_provider.h index 7257624..33239f9 100644 --- a/components/omnibox/browser/history_quick_provider.h +++ b/components/omnibox/browser/history_quick_provider.h @@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "components/history/core/browser/history_types.h" #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_match.h" diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc index 1965be5..978cb86 100644 --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" diff --git a/components/omnibox/browser/history_url_provider.h b/components/omnibox/browser/history_url_provider.h index d7d67e8..9cee39d 100644 --- a/components/omnibox/browser/history_url_provider.h +++ b/components/omnibox/browser/history_url_provider.h @@ -5,11 +5,14 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/synchronization/cancellation_flag.h" #include "base/threading/thread_checker.h" #include "components/history/core/browser/history_match.h" diff --git a/components/omnibox/browser/in_memory_url_index.h b/components/omnibox/browser/in_memory_url_index.h index e13aabf..1f098cb 100644 --- a/components/omnibox/browser/in_memory_url_index.h +++ b/components/omnibox/browser/in_memory_url_index.h @@ -5,15 +5,17 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_H_ #define COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_H_ +#include <stddef.h> + #include <functional> #include <map> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/components/omnibox/browser/in_memory_url_index_types.h b/components/omnibox/browser/in_memory_url_index_types.h index 2ef6b76..218760a 100644 --- a/components/omnibox/browser/in_memory_url_index_types.h +++ b/components/omnibox/browser/in_memory_url_index_types.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_TYPES_H_ #define COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_TYPES_H_ +#include <stddef.h> + #include <map> #include <set> #include <vector> diff --git a/components/omnibox/browser/in_memory_url_index_types_unittest.cc b/components/omnibox/browser/in_memory_url_index_types_unittest.cc index 9229d43..a66ea9b 100644 --- a/components/omnibox/browser/in_memory_url_index_types_unittest.cc +++ b/components/omnibox/browser/in_memory_url_index_types_unittest.cc @@ -4,8 +4,11 @@ #include "components/omnibox/browser/in_memory_url_index_types.h" +#include <stddef.h> + #include <algorithm> +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/omnibox/browser/keyword_extensions_delegate.h b/components/omnibox/browser/keyword_extensions_delegate.h index 1b67b98..ce833da 100644 --- a/components/omnibox/browser/keyword_extensions_delegate.h +++ b/components/omnibox/browser/keyword_extensions_delegate.h @@ -12,7 +12,6 @@ #include <string> -#include "base/basictypes.h" #include "base/macros.h" #include "base/strings/string16.h" diff --git a/components/omnibox/browser/keyword_provider.cc b/components/omnibox/browser/keyword_provider.cc index 360d94b..a0b5cc8 100644 --- a/components/omnibox/browser/keyword_provider.cc +++ b/components/omnibox/browser/keyword_provider.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/keyword_provider.h b/components/omnibox/browser/keyword_provider.h index e82e6cd..5263871 100644 --- a/components/omnibox/browser/keyword_provider.h +++ b/components/omnibox/browser/keyword_provider.h @@ -11,10 +11,12 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/omnibox/browser/autocomplete_input.h" diff --git a/components/omnibox/browser/keyword_provider_unittest.cc b/components/omnibox/browser/keyword_provider_unittest.cc index ff66f15..fa44fba 100644 --- a/components/omnibox/browser/keyword_provider_unittest.cc +++ b/components/omnibox/browser/keyword_provider_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/mock_autocomplete_provider_client.h b/components/omnibox/browser/mock_autocomplete_provider_client.h index fc73c1f..5367ba3 100644 --- a/components/omnibox/browser/mock_autocomplete_provider_client.h +++ b/components/omnibox/browser/mock_autocomplete_provider_client.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "components/omnibox/browser/autocomplete_provider_client.h" #include "components/omnibox/browser/autocomplete_scheme_classifier.h" #include "components/search_engines/search_terms_data.h" diff --git a/components/omnibox/browser/omnibox_client.h b/components/omnibox/browser/omnibox_client.h index 77c9079..e2d013c 100644 --- a/components/omnibox/browser/omnibox_client.h +++ b/components/omnibox/browser/omnibox_client.h @@ -5,7 +5,6 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CLIENT_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CLIENT_H_ -#include "base/basictypes.h" #include "components/omnibox/browser/autocomplete_provider_client.h" #include "components/omnibox/browser/omnibox_navigation_observer.h" #include "components/omnibox/common/omnibox_focus_state.h" diff --git a/components/omnibox/browser/omnibox_controller.h b/components/omnibox/browser/omnibox_controller.h index dead265..b352ec0 100644 --- a/components/omnibox/browser/omnibox_controller.h +++ b/components/omnibox/browser/omnibox_controller.h @@ -5,8 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CONTROLLER_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/omnibox/browser/autocomplete_controller.h" diff --git a/components/omnibox/browser/omnibox_edit_controller.h b/components/omnibox/browser/omnibox_edit_controller.h index 622c485..9dab8b3 100644 --- a/components/omnibox/browser/omnibox_edit_controller.h +++ b/components/omnibox/browser/omnibox_edit_controller.h @@ -5,6 +5,7 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_CONTROLLER_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_CONTROLLER_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/page_transition_types.h" #include "ui/base/window_open_disposition.h" diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc index e194a03..369a77d 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -9,6 +9,7 @@ #include "base/auto_reset.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_number_conversions.h" diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h index 1e8dcf8..13f3035 100644 --- a/components/omnibox/browser/omnibox_edit_model.h +++ b/components/omnibox/browser/omnibox_edit_model.h @@ -5,8 +5,10 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc index 8d6f801..95d0c67 100644 --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc @@ -14,6 +14,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/browser/omnibox_switches.h" #include "components/search/search.h" @@ -141,7 +142,7 @@ int OmniboxFieldTrial::GetDisabledProviderTypes() { } void OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes( - std::vector<uint32>* field_trial_hashes) { + std::vector<uint32_t>* field_trial_hashes) { field_trial_hashes->clear(); for (int i = 0; i < kMaxAutocompleteDynamicFieldTrials; ++i) { const std::string& trial_name = DynamicFieldTrialName(i); diff --git a/components/omnibox/browser/omnibox_field_trial.h b/components/omnibox/browser/omnibox_field_trial.h index f7ed8de..9309ba3 100644 --- a/components/omnibox/browser/omnibox_field_trial.h +++ b/components/omnibox/browser/omnibox_field_trial.h @@ -5,11 +5,14 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_FIELD_TRIAL_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_FIELD_TRIAL_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/browser/autocomplete_match_type.h" @@ -123,7 +126,7 @@ class OmniboxFieldTrial { // Populates |field_trial_hash| with hashes of the active suggest field trial // names, if any. static void GetActiveSuggestFieldTrialHashes( - std::vector<uint32>* field_trial_hash); + std::vector<uint32_t>* field_trial_hash); // --------------------------------------------------------- // For the AutocompleteController "stop timer" field trial. diff --git a/components/omnibox/browser/omnibox_field_trial_unittest.cc b/components/omnibox/browser/omnibox_field_trial_unittest.cc index b24f629..77f903d 100644 --- a/components/omnibox/browser/omnibox_field_trial_unittest.cc +++ b/components/omnibox/browser/omnibox_field_trial_unittest.cc @@ -4,11 +4,12 @@ #include "components/omnibox/browser/omnibox_field_trial.h" -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search/search.h" #include "components/variations/entropy_provider.h" diff --git a/components/omnibox/browser/omnibox_metrics_provider.h b/components/omnibox/browser/omnibox_metrics_provider.h index 11cb5f5..1bf0ead 100644 --- a/components/omnibox/browser/omnibox_metrics_provider.h +++ b/components/omnibox/browser/omnibox_metrics_provider.h @@ -5,7 +5,7 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_METRICS_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_METRICS_PROVIDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/metrics/metrics_provider.h" #include "components/metrics/proto/chrome_user_metrics_extension.pb.h" #include "components/omnibox/browser/omnibox_event_global_tracker.h" diff --git a/components/omnibox/browser/omnibox_popup_model.h b/components/omnibox/browser/omnibox_popup_model.h index a878849..3668a11 100644 --- a/components/omnibox/browser/omnibox_popup_model.h +++ b/components/omnibox/browser/omnibox_popup_model.h @@ -5,7 +5,9 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/observer_list.h" #include "components/omnibox/browser/autocomplete_controller.h" #include "components/omnibox/browser/autocomplete_result.h" diff --git a/components/omnibox/browser/omnibox_popup_view.h b/components/omnibox/browser/omnibox_popup_view.h index 5ba71fe..74dd208 100644 --- a/components/omnibox/browser/omnibox_popup_view.h +++ b/components/omnibox/browser/omnibox_popup_view.h @@ -11,6 +11,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_VIEW_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_VIEW_H_ +#include <stddef.h> + #include "build/build_config.h" namespace gfx { diff --git a/components/omnibox/browser/omnibox_view.cc b/components/omnibox/browser/omnibox_view.cc index d070f0a..bf9f8f8 100644 --- a/components/omnibox/browser/omnibox_view.cc +++ b/components/omnibox/browser/omnibox_view.cc @@ -10,6 +10,7 @@ #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/omnibox_client.h" #include "components/omnibox/browser/omnibox_edit_controller.h" diff --git a/components/omnibox/browser/omnibox_view.h b/components/omnibox/browser/omnibox_view.h index a053c60..2524bf9e 100644 --- a/components/omnibox/browser/omnibox_view.h +++ b/components/omnibox/browser/omnibox_view.h @@ -11,9 +11,12 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_VIEW_H_ #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_VIEW_H_ +#include <stddef.h> + #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/omnibox_view_unittest.cc b/components/omnibox/browser/omnibox_view_unittest.cc index 1056e78..b9dcf92 100644 --- a/components/omnibox/browser/omnibox_view_unittest.cc +++ b/components/omnibox/browser/omnibox_view_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/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/scored_history_match.h b/components/omnibox/browser/scored_history_match.h index bcb270b..0b2e1a0 100644 --- a/components/omnibox/browser/scored_history_match.h +++ b/components/omnibox/browser/scored_history_match.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_SCORED_HISTORY_MATCH_H_ #define COMPONENTS_OMNIBOX_BROWSER_SCORED_HISTORY_MATCH_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc index b26910c..72cb2fe 100644 --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/search_provider.h" +#include <stddef.h> + #include <algorithm> #include <cmath> diff --git a/components/omnibox/browser/search_provider.h b/components/omnibox/browser/search_provider.h index 259e7c6..eaacdcb 100644 --- a/components/omnibox/browser/search_provider.h +++ b/components/omnibox/browser/search_provider.h @@ -14,9 +14,9 @@ #include <string> #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/time/time.h" #include "base/timer/timer.h" diff --git a/components/omnibox/browser/search_suggestion_parser.cc b/components/omnibox/browser/search_suggestion_parser.cc index df0e00b..95558ec 100644 --- a/components/omnibox/browser/search_suggestion_parser.cc +++ b/components/omnibox/browser/search_suggestion_parser.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/search_suggestion_parser.h" +#include <stddef.h> + #include <algorithm> #include "base/i18n/icu_string_conversions.h" diff --git a/components/omnibox/browser/search_suggestion_parser.h b/components/omnibox/browser/search_suggestion_parser.h index 3ecb78e..448a1c4 100644 --- a/components/omnibox/browser/search_suggestion_parser.h +++ b/components/omnibox/browser/search_suggestion_parser.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "components/omnibox/browser/autocomplete_match.h" diff --git a/components/omnibox/browser/shortcuts_backend.cc b/components/omnibox/browser/shortcuts_backend.cc index 99d6f84..8bfa6e6 100644 --- a/components/omnibox/browser/shortcuts_backend.cc +++ b/components/omnibox/browser/shortcuts_backend.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/shortcuts_backend.h" +#include <stddef.h> + #include <map> #include <string> #include <vector> diff --git a/components/omnibox/browser/shortcuts_backend.h b/components/omnibox/browser/shortcuts_backend.h index 957762f..a2fde3f 100644 --- a/components/omnibox/browser/shortcuts_backend.h +++ b/components/omnibox/browser/shortcuts_backend.h @@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" diff --git a/components/omnibox/browser/shortcuts_database.h b/components/omnibox/browser/shortcuts_database.h index 968bba4..10d6a4c 100644 --- a/components/omnibox/browser/shortcuts_database.h +++ b/components/omnibox/browser/shortcuts_database.h @@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "sql/connection.h" diff --git a/components/omnibox/browser/shortcuts_database_unittest.cc b/components/omnibox/browser/shortcuts_database_unittest.cc index 902868c..15116b8 100644 --- a/components/omnibox/browser/shortcuts_database_unittest.cc +++ b/components/omnibox/browser/shortcuts_database_unittest.cc @@ -4,12 +4,16 @@ #include "components/omnibox/browser/shortcuts_database.h" +#include <stddef.h> + #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/omnibox/browser/autocomplete_match_type.h" #include "components/omnibox/browser/shortcuts_constants.h" #include "sql/statement.h" diff --git a/components/omnibox/browser/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc index 5e8b2f2..dcea1d2 100644 --- a/components/omnibox/browser/shortcuts_provider.cc +++ b/components/omnibox/browser/shortcuts_provider.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/shortcuts_provider.h" +#include <stddef.h> + #include <algorithm> #include <cmath> #include <map> diff --git a/components/omnibox/browser/suggestion_answer.cc b/components/omnibox/browser/suggestion_answer.cc index dc48910..cf6f2b4 100644 --- a/components/omnibox/browser/suggestion_answer.cc +++ b/components/omnibox/browser/suggestion_answer.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/suggestion_answer.h" +#include <stddef.h> + #include "base/i18n/rtl.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/suggestion_answer.h b/components/omnibox/browser/suggestion_answer.h index e64fe4d..6f947a7 100644 --- a/components/omnibox/browser/suggestion_answer.h +++ b/components/omnibox/browser/suggestion_answer.h @@ -9,6 +9,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "url/gurl.h" diff --git a/components/omnibox/browser/test_scheme_classifier.cc b/components/omnibox/browser/test_scheme_classifier.cc index df9b0d0..9e7b8ac 100644 --- a/components/omnibox/browser/test_scheme_classifier.cc +++ b/components/omnibox/browser/test_scheme_classifier.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 "components/metrics/proto/omnibox_input_type.pb.h" #include "components/omnibox/browser/test_scheme_classifier.h" #include "net/url_request/url_request.h" diff --git a/components/omnibox/browser/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc index 77ddb9f..0409ea6 100644 --- a/components/omnibox/browser/url_index_private_data.cc +++ b/components/omnibox/browser/url_index_private_data.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/url_index_private_data.h" +#include <stdint.h> + #include <functional> #include <iterator> #include <limits> @@ -11,10 +13,10 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_util.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -1077,8 +1079,8 @@ bool URLIndexPrivateData::RestoreWordList( if (!cache.has_word_list()) return false; const WordListItem& list_item(cache.word_list()); - uint32 expected_item_count = list_item.word_count(); - uint32 actual_item_count = list_item.word_size(); + uint32_t expected_item_count = list_item.word_count(); + uint32_t actual_item_count = list_item.word_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<std::string>& words(list_item.word()); @@ -1093,8 +1095,8 @@ bool URLIndexPrivateData::RestoreWordMap( if (!cache.has_word_map()) return false; const WordMapItem& list_item(cache.word_map()); - uint32 expected_item_count = list_item.item_count(); - uint32 actual_item_count = list_item.word_map_entry_size(); + uint32_t expected_item_count = list_item.item_count(); + uint32_t actual_item_count = list_item.word_map_entry_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<WordMapEntry>& entries(list_item.word_map_entry()); @@ -1109,8 +1111,8 @@ bool URLIndexPrivateData::RestoreCharWordMap( if (!cache.has_char_word_map()) return false; const CharWordMapItem& list_item(cache.char_word_map()); - uint32 expected_item_count = list_item.item_count(); - uint32 actual_item_count = list_item.char_word_map_entry_size(); + uint32_t expected_item_count = list_item.item_count(); + uint32_t actual_item_count = list_item.char_word_map_entry_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<CharWordMapEntry>& @@ -1123,8 +1125,8 @@ bool URLIndexPrivateData::RestoreCharWordMap( return false; base::char16 uni_char = static_cast<base::char16>(iter->char_16()); WordIDSet word_id_set; - const RepeatedField<int32>& word_ids(iter->word_id()); - for (RepeatedField<int32>::const_iterator jiter = word_ids.begin(); + const RepeatedField<int32_t>& word_ids(iter->word_id()); + for (RepeatedField<int32_t>::const_iterator jiter = word_ids.begin(); jiter != word_ids.end(); ++jiter) word_id_set.insert(*jiter); char_word_map_[uni_char] = word_id_set; @@ -1137,8 +1139,8 @@ bool URLIndexPrivateData::RestoreWordIDHistoryMap( if (!cache.has_word_id_history_map()) return false; const WordIDHistoryMapItem& list_item(cache.word_id_history_map()); - uint32 expected_item_count = list_item.item_count(); - uint32 actual_item_count = list_item.word_id_history_map_entry_size(); + uint32_t expected_item_count = list_item.item_count(); + uint32_t actual_item_count = list_item.word_id_history_map_entry_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<WordIDHistoryMapEntry>& @@ -1151,8 +1153,8 @@ bool URLIndexPrivateData::RestoreWordIDHistoryMap( return false; WordID word_id = iter->word_id(); HistoryIDSet history_id_set; - const RepeatedField<int64>& history_ids(iter->history_id()); - for (RepeatedField<int64>::const_iterator jiter = history_ids.begin(); + const RepeatedField<int64_t>& history_ids(iter->history_id()); + for (RepeatedField<int64_t>::const_iterator jiter = history_ids.begin(); jiter != history_ids.end(); ++jiter) { history_id_set.insert(*jiter); AddToHistoryIDWordMap(*jiter, word_id); @@ -1167,8 +1169,8 @@ bool URLIndexPrivateData::RestoreHistoryInfoMap( if (!cache.has_history_info_map()) return false; const HistoryInfoMapItem& list_item(cache.history_info_map()); - uint32 expected_item_count = list_item.item_count(); - uint32 actual_item_count = list_item.history_info_map_entry_size(); + uint32_t expected_item_count = list_item.item_count(); + uint32_t actual_item_count = list_item.history_info_map_entry_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<HistoryInfoMapEntry>& @@ -1208,8 +1210,8 @@ bool URLIndexPrivateData::RestoreWordStartsMap( // page titles. if (cache.has_word_starts_map()) { const WordStartsMapItem& list_item(cache.word_starts_map()); - uint32 expected_item_count = list_item.item_count(); - uint32 actual_item_count = list_item.word_starts_map_entry_size(); + uint32_t expected_item_count = list_item.item_count(); + uint32_t actual_item_count = list_item.word_starts_map_entry_size(); if (actual_item_count == 0 || actual_item_count != expected_item_count) return false; const RepeatedPtrField<WordStartsMapEntry>& @@ -1219,13 +1221,13 @@ bool URLIndexPrivateData::RestoreWordStartsMap( HistoryID history_id = iter->history_id(); RowWordStarts word_starts; // Restore the URL word starts. - const RepeatedField<int32>& url_starts(iter->url_word_starts()); - for (RepeatedField<int32>::const_iterator jiter = url_starts.begin(); + const RepeatedField<int32_t>& url_starts(iter->url_word_starts()); + for (RepeatedField<int32_t>::const_iterator jiter = url_starts.begin(); jiter != url_starts.end(); ++jiter) word_starts.url_word_starts_.push_back(*jiter); // Restore the page title word starts. - const RepeatedField<int32>& title_starts(iter->title_word_starts()); - for (RepeatedField<int32>::const_iterator jiter = title_starts.begin(); + const RepeatedField<int32_t>& title_starts(iter->title_word_starts()); + for (RepeatedField<int32_t>::const_iterator jiter = title_starts.begin(); jiter != title_starts.end(); ++jiter) word_starts.title_word_starts_.push_back(*jiter); word_starts_map_[history_id] = word_starts; diff --git a/components/omnibox/browser/url_index_private_data.h b/components/omnibox/browser/url_index_private_data.h index c772f29..9253ee1 100644 --- a/components/omnibox/browser/url_index_private_data.h +++ b/components/omnibox/browser/url_index_private_data.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_ #define COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_ +#include <stddef.h> + #include <set> #include <string> diff --git a/components/omnibox/browser/url_prefix.cc b/components/omnibox/browser/url_prefix.cc index bc0eab4..2c52959 100644 --- a/components/omnibox/browser/url_prefix.cc +++ b/components/omnibox/browser/url_prefix.cc @@ -4,7 +4,6 @@ #include "components/omnibox/browser/url_prefix.h" -#include "base/basictypes.h" #include "base/i18n/case_conversion.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/browser/url_prefix.h b/components/omnibox/browser/url_prefix.h index a0b555d..96fd1ef 100644 --- a/components/omnibox/browser/url_prefix.h +++ b/components/omnibox/browser/url_prefix.h @@ -5,6 +5,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_URL_PREFIX_H_ #define COMPONENTS_OMNIBOX_BROWSER_URL_PREFIX_H_ +#include <stddef.h> + #include <vector> #include "base/strings/string16.h" diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc index a12a1b4..e1f7be7 100644 --- a/components/omnibox/browser/zero_suggest_provider.cc +++ b/components/omnibox/browser/zero_suggest_provider.cc @@ -4,6 +4,8 @@ #include "components/omnibox/browser/zero_suggest_provider.h" +#include <stddef.h> + #include "base/callback.h" #include "base/i18n/case_conversion.h" #include "base/json/json_string_value_serializer.h" diff --git a/components/omnibox/browser/zero_suggest_provider.h b/components/omnibox/browser/zero_suggest_provider.h index 904aa6d..79fa99f 100644 --- a/components/omnibox/browser/zero_suggest_provider.h +++ b/components/omnibox/browser/zero_suggest_provider.h @@ -9,8 +9,8 @@ #ifndef COMPONENTS_OMNIBOX_BROWSER_ZERO_SUGGEST_PROVIDER_H_ #define COMPONENTS_OMNIBOX_BROWSER_ZERO_SUGGEST_PROVIDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/history/core/browser/history_types.h" #include "components/metrics/proto/omnibox_event.pb.h" |