diff options
57 files changed, 57 insertions, 57 deletions
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc index fd9ac7f..12f5d81 100644 --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/content/common/autofill_messages.h" #include "components/autofill/content/renderer/form_autofill_util.h" diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc index 0618dc4..5545f99 100644 --- a/components/autofill/core/browser/autofill_external_delegate.cc +++ b/components/autofill/core/browser/autofill_external_delegate.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/core/browser/autofill_metrics.cc b/components/autofill/core/browser/autofill_metrics.cc index ebf5a6d..b761247 100644 --- a/components/autofill/core/browser/autofill_metrics.cc +++ b/components/autofill/core/browser/autofill_metrics.cc @@ -5,7 +5,7 @@ #include "components/autofill/core/browser/autofill_metrics.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/time/time.h" #include "components/autofill/core/browser/autofill_type.h" diff --git a/components/autofill/core/browser/personal_data_manager_mac.mm b/components/autofill/core/browser/personal_data_manager_mac.mm index 77b06c9..1dcfbbc 100644 --- a/components/autofill/core/browser/personal_data_manager_mac.mm +++ b/components/autofill/core/browser/personal_data_manager_mac.mm @@ -14,7 +14,7 @@ #import "base/mac/scoped_nsexception_enabler.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" diff --git a/components/autofill/core/common/password_generation_util.cc b/components/autofill/core/common/password_generation_util.cc index bdbd20b..530f75f 100644 --- a/components/autofill/core/common/password_generation_util.cc +++ b/components/autofill/core/common/password_generation_util.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "components/autofill/core/common/autofill_switches.h" namespace autofill { diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc index 74d6417..bc3fbfb 100644 --- a/components/bookmarks/browser/bookmark_storage.cc +++ b/components/bookmarks/browser/bookmark_storage.cc @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/sequenced_task_runner.h" #include "base/time/time.h" #include "components/bookmarks/browser/bookmark_codec.h" diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc index d6012f3..587e892 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_registry.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc index 1035732..a519cef 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h" #include "base/time/clock.h" diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc index cd83900..8f8d8d3 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_registry.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc index 0466c8a..791a573 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc @@ -5,7 +5,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h" #include "base/callback.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc index 238130d..f272fd9 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc index 28113ef..2adc560 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/metrics/field_trial.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc index 89bb199..81532b8 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc index 81b69bb..ca34807 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc index 823d0a7..55d3ab5 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/md5.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/components/dom_distiller/core/distiller_page.cc b/components/dom_distiller/core/distiller_page.cc index 12c186a..97b86e8 100644 --- a/components/dom_distiller/core/distiller_page.cc +++ b/components/dom_distiller/core/distiller_page.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/location.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/dom_distiller/core/feedback_reporter.cc b/components/dom_distiller/core/feedback_reporter.cc index a536ef7..890833a 100644 --- a/components/dom_distiller/core/feedback_reporter.cc +++ b/components/dom_distiller/core/feedback_reporter.cc @@ -4,7 +4,7 @@ #include "components/dom_distiller/core/feedback_reporter.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" namespace dom_distiller { diff --git a/components/dom_distiller/core/viewer.cc b/components/dom_distiller/core/viewer.cc index e61734f..2e13161 100644 --- a/components/dom_distiller/core/viewer.cc +++ b/components/dom_distiller/core/viewer.cc @@ -9,7 +9,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "components/dom_distiller/core/distilled_page_prefs.h" #include "components/dom_distiller/core/dom_distiller_service.h" diff --git a/components/error_page/common/net_error_info.cc b/components/error_page/common/net_error_info.cc index d47e7e5..7483e73 100644 --- a/components/error_page/common/net_error_info.cc +++ b/components/error_page/common/net_error_info.cc @@ -5,7 +5,7 @@ #include "components/error_page/common/net_error_info.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" namespace chrome_common_net { diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc index ad48bf4..25e94e9 100644 --- a/components/gcm_driver/gcm_driver_desktop.cc +++ b/components/gcm_driver/gcm_driver_desktop.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/profiler/scoped_tracker.h" #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/components/gcm_driver/gcm_stats_recorder_impl.cc b/components/gcm_driver/gcm_stats_recorder_impl.cc index 6bf6963..792202b 100644 --- a/components/gcm_driver/gcm_stats_recorder_impl.cc +++ b/components/gcm_driver/gcm_stats_recorder_impl.cc @@ -9,7 +9,7 @@ #include "base/format_macros.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/components/google/core/browser/google_search_metrics.cc b/components/google/core/browser/google_search_metrics.cc index e9f305e..d284a7c 100644 --- a/components/google/core/browser/google_search_metrics.cc +++ b/components/google/core/browser/google_search_metrics.cc @@ -5,7 +5,7 @@ #include "components/google/core/browser/google_search_metrics.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" GoogleSearchMetrics::GoogleSearchMetrics() { } diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc index d04c038..1110993 100644 --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc @@ -18,7 +18,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_util.h" diff --git a/components/history/core/browser/thumbnail_database.cc b/components/history/core/browser/thumbnail_database.cc index 258a3b0..2e699ce 100644 --- a/components/history/core/browser/thumbnail_database.cc +++ b/components/history/core/browser/thumbnail_database.cc @@ -13,7 +13,7 @@ #include "base/files/file_util.h" #include "base/format_macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc index 74cc6d0..1acb79e 100644 --- a/components/history/core/browser/top_sites_impl.cc +++ b/components/history/core/browser/top_sites_impl.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/md5.h" #include "base/memory/ref_counted_memory.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/single_thread_task_runner.h" diff --git a/components/invalidation/gcm_network_channel.cc b/components/invalidation/gcm_network_channel.cc index 9f74b55..0c53612 100644 --- a/components/invalidation/gcm_network_channel.cc +++ b/components/invalidation/gcm_network_channel.cc @@ -5,7 +5,7 @@ #include "base/base64.h" #include "base/i18n/time_formatting.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/sha1.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" diff --git a/components/invalidation/ticl_invalidation_service.cc b/components/invalidation/ticl_invalidation_service.cc index 14a4e06..1d3b594 100644 --- a/components/invalidation/ticl_invalidation_service.cc +++ b/components/invalidation/ticl_invalidation_service.cc @@ -5,7 +5,7 @@ #include "components/invalidation/ticl_invalidation_service.h" #include "base/command_line.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "components/gcm_driver/gcm_driver.h" #include "components/invalidation/gcm_invalidation_bridge.h" #include "components/invalidation/invalidation_service_util.h" diff --git a/components/nacl/browser/nacl_browser.cc b/components/nacl/browser/nacl_browser.cc index 3e69458..d9baa38 100644 --- a/components/nacl/browser/nacl_browser.cc +++ b/components/nacl/browser/nacl_browser.cc @@ -8,7 +8,7 @@ #include "base/files/file_proxy.h" #include "base/files/file_util.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/pickle.h" #include "base/rand_util.h" diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index 742e773..dda1bd3 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/process/process_iterator.h" diff --git a/components/omnibox/search_provider.cc b/components/omnibox/search_provider.cc index 974825e..58642f8 100644 --- a/components/omnibox/search_provider.cc +++ b/components/omnibox/search_provider.cc @@ -13,7 +13,7 @@ #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" #include "base/json/json_string_value_serializer.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/rand_util.h" #include "base/strings/string_util.h" diff --git a/components/omnibox/search_suggestion_parser.cc b/components/omnibox/search_suggestion_parser.cc index 5ef4201..32e6f04 100644 --- a/components/omnibox/search_suggestion_parser.cc +++ b/components/omnibox/search_suggestion_parser.cc @@ -10,7 +10,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_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/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc index 9039b8c..e786566 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/pickle.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc index 9995a218..b83e1c0 100644 --- a/components/password_manager/core/browser/password_form_manager.cc +++ b/components/password_manager/core/browser/password_form_manager.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <set> -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc index 4ff4f02..2df5a91 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_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/password_manager/core/browser/password_manager_metrics_util.cc b/components/password_manager/core/browser/password_manager_metrics_util.cc index 32c7bb3..78bd7bf 100644 --- a/components/password_manager/core/browser/password_manager_metrics_util.cc +++ b/components/password_manager/core/browser/password_manager_metrics_util.cc @@ -5,7 +5,7 @@ #include "components/password_manager/core/browser/password_manager_metrics_util.h" #include "base/basictypes.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc index ce3279f..0a88228 100644 --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/debug/dump_without_crashing.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "base/thread_task_runner_handle.h" #include "components/autofill/core/common/password_form.h" diff --git a/components/password_manager/core/browser/password_syncable_service.cc b/components/password_manager/core/browser/password_syncable_service.cc index d8ced9d..961d089 100644 --- a/components/password_manager/core/browser/password_syncable_service.cc +++ b/components/password_manager/core/browser/password_syncable_service.cc @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/location.h" #include "base/memory/scoped_vector.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/core/common/password_form.h" #include "components/password_manager/core/browser/password_store_sync.h" diff --git a/components/plugins/renderer/webview_plugin.cc b/components/plugins/renderer/webview_plugin.cc index 0779566..329a10c7 100644 --- a/components/plugins/renderer/webview_plugin.cc +++ b/components/plugins/renderer/webview_plugin.cc @@ -5,7 +5,7 @@ #include "components/plugins/renderer/webview_plugin.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "content/public/common/web_preferences.h" #include "content/public/renderer/render_view.h" diff --git a/components/policy/core/browser/browser_policy_connector.cc b/components/policy/core/browser/browser_policy_connector.cc index 7a5337e..842e3ad 100644 --- a/components/policy/core/browser/browser_policy_connector.cc +++ b/components/policy/core/browser/browser_policy_connector.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/strings/string16.h" diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc index 77f86c2..d33a6f5 100644 --- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc +++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/sequenced_task_runner.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" diff --git a/components/policy/core/common/cloud/cloud_policy_validator.cc b/components/policy/core/common/cloud/cloud_policy_validator.cc index 29810b2..22f85b3 100644 --- a/components/policy/core/common/cloud/cloud_policy_validator.cc +++ b/components/policy/core/common/cloud/cloud_policy_validator.cc @@ -6,7 +6,7 @@ #include "base/bind_helpers.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" diff --git a/components/policy/core/common/cloud/user_cloud_policy_store.cc b/components/policy/core/common/cloud/user_cloud_policy_store.cc index db8302d..ce6412a 100644 --- a/components/policy/core/common/cloud/user_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_store.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/task_runner_util.h" #include "google_apis/gaia/gaia_auth_util.h" #include "policy/proto/cloud_policy.pb.h" diff --git a/components/precache/core/precache_database.cc b/components/precache/core/precache_database.cc index 7dfa052..df2aec0 100644 --- a/components/precache/core/precache_database.cc +++ b/components/precache/core/precache_database.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc index 0b00713..0c14bc3 100644 --- a/components/printing/renderer/print_web_view_helper.cc +++ b/components/printing/renderer/print_web_view_helper.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/location.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/process/process_handle.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc index d4dce70..9fee795 100644 --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc @@ -13,7 +13,7 @@ #include "base/guid.h" #include "base/i18n/case_conversion.h" #include "base/memory/scoped_vector.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc index 4783264..0d45097 100644 --- a/components/signin/core/browser/signin_manager.cc +++ b/components/signin/core/browser/signin_manager.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/components/storage_monitor/media_storage_util.cc b/components/storage_monitor/media_storage_util.cc index 8a39d5b..45dbdf7 100644 --- a/components/storage_monitor/media_storage_util.cc +++ b/components/storage_monitor/media_storage_util.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/storage_monitor/removable_device_constants.h" diff --git a/components/suggestions/blacklist_store.cc b/components/suggestions/blacklist_store.cc index c9245e7..cc529ad 100644 --- a/components/suggestions/blacklist_store.cc +++ b/components/suggestions/blacklist_store.cc @@ -9,7 +9,7 @@ #include <string> #include "base/base64.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/suggestions/suggestions_pref_names.h" diff --git a/components/suggestions/suggestions_service.cc b/components/suggestions/suggestions_service.cc index f8f1398..ee9e9d2 100644 --- a/components/suggestions/suggestions_service.cc +++ b/components/suggestions/suggestions_service.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/memory/scoped_ptr.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" diff --git a/components/sync_driver/data_type_manager_impl.cc b/components/sync_driver/data_type_manager_impl.cc index ceaa102..8f11029 100644 --- a/components/sync_driver/data_type_manager_impl.cc +++ b/components/sync_driver/data_type_manager_impl.cc @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc index 69da02a..6924712 100644 --- a/components/sync_driver/model_association_manager.cc +++ b/components/sync_driver/model_association_manager.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc index a020f0a..121cc32 100644 --- a/components/translate/content/renderer/translate_helper.cc +++ b/components/translate/content/renderer/translate_helper.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/location.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" diff --git a/components/translate/core/browser/translate_browser_metrics.cc b/components/translate/core/browser/translate_browser_metrics.cc index 3b74cdc..d2791050 100644 --- a/components/translate/core/browser/translate_browser_metrics.cc +++ b/components/translate/core/browser/translate_browser_metrics.cc @@ -7,7 +7,7 @@ #include <string> #include "base/basictypes.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "components/language_usage_metrics/language_usage_metrics.h" diff --git a/components/translate/core/browser/translate_infobar_delegate.cc b/components/translate/core/browser/translate_infobar_delegate.cc index 8006c06f..cd79985 100644 --- a/components/translate/core/browser/translate_infobar_delegate.cc +++ b/components/translate/core/browser/translate_infobar_delegate.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/i18n/string_compare.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar_manager.h" #include "components/translate/core/browser/language_state.h" diff --git a/components/translate/core/browser/translate_ui_delegate.cc b/components/translate/core/browser/translate_ui_delegate.cc index f98086d..2024c53 100644 --- a/components/translate/core/browser/translate_ui_delegate.cc +++ b/components/translate/core/browser/translate_ui_delegate.cc @@ -5,7 +5,7 @@ #include "components/translate/core/browser/translate_ui_delegate.h" #include "base/i18n/string_compare.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "components/translate/core/browser/language_state.h" #include "components/translate/core/browser/translate_client.h" #include "components/translate/core/browser/translate_download_manager.h" diff --git a/components/translate/core/common/translate_metrics.cc b/components/translate/core/common/translate_metrics.cc index 3f4e10e..84dcf34ef 100644 --- a/components/translate/core/common/translate_metrics.cc +++ b/components/translate/core/common/translate_metrics.cc @@ -5,7 +5,7 @@ #include "components/translate/core/common/translate_metrics.h" #include "base/basictypes.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "url/url_constants.h" namespace translate { diff --git a/components/web_cache/browser/web_cache_manager.cc b/components/web_cache/browser/web_cache_manager.cc index 2c41b63..dfed012 100644 --- a/components/web_cache/browser/web_cache_manager.cc +++ b/components/web_cache/browser/web_cache_manager.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/location.h" #include "base/memory/singleton.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" |