From 12d9cdafee5f8ed2fa72868ec75c34eec0216000 Mon Sep 17 00:00:00 2001 From: asvitkine Date: Thu, 19 Jan 2017 07:17:38 -0800 Subject: [PATCH] Migrate desktop Linux to histogram_macros.h include. Updates ifdefs in histogram.h to prevent this from regressing for Linux desktop. The ifdef will be updated incrementally as each platform becomes fully migrated. BUG=416479 TBR=gbillock@chromium.org,tommi@chromium.org,stevenjb@chromium.org,rockot@chromium.org,sadrul@chromium.org Review-Url: https://codereview.chromium.org/2639313002 Cr-Commit-Position: refs/heads/master@{#444736} --- base/metrics/histogram.h | 3 ++- components/storage_monitor/storage_monitor_linux.cc | 2 +- dbus/exported_object.cc | 2 +- dbus/object_proxy.cc | 2 +- dbus/signal_sender_verification_unittest.cc | 2 +- device/battery/battery_status_manager_linux.cc | 2 +- device/bluetooth/bluez/bluetooth_adapter_bluez.cc | 2 +- device/bluetooth/bluez/bluetooth_device_bluez.cc | 2 +- device/bluetooth/bluez/bluetooth_pairing_bluez.cc | 2 +- media/audio/linux/audio_manager_linux.cc | 2 +- ui/base/clipboard/clipboard_aurax11.cc | 2 +- ui/base/x/x11_util.cc | 2 +- ui/keyboard/keyboard_util.cc | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h index 63fd2437344c09..4500efcf3abd04 100644 --- a/base/metrics/histogram.h +++ b/base/metrics/histogram.h @@ -81,7 +81,8 @@ #include "base/macros.h" #include "base/metrics/bucket_ranges.h" #include "base/metrics/histogram_base.h" -#if !defined(OS_MACOSX) || defined(OS_IOS) +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_IOS) || \ + defined(OS_WIN) // TODO(asvitkine): Migrate callers to to include this directly and remove this. // Note: Incrementally migrating platforms as they become clean. #include "base/metrics/histogram_macros.h" diff --git a/components/storage_monitor/storage_monitor_linux.cc b/components/storage_monitor/storage_monitor_linux.cc index 4b3a01fae7b7e3..1bbffa9e65e6c2 100644 --- a/components/storage_monitor/storage_monitor_linux.cc +++ b/components/storage_monitor/storage_monitor_linux.cc @@ -15,7 +15,7 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/process/process.h" diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc index 19d17150ea4189..0024df6c281193 100644 --- a/dbus/exported_object.cc +++ b/dbus/exported_object.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "dbus/bus.h" diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index 5d9d8e842f0a43..15f20c76c0bd07 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/task_runner_util.h" diff --git a/dbus/signal_sender_verification_unittest.cc b/dbus/signal_sender_verification_unittest.cc index 320718dcc78b03..7f5c790683dc27 100644 --- a/dbus/signal_sender_verification_unittest.cc +++ b/dbus/signal_sender_verification_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" #include "base/run_loop.h" diff --git a/device/battery/battery_status_manager_linux.cc b/device/battery/battery_status_manager_linux.cc index ce52f9fbdd07f6..7d9469ec29789b 100644 --- a/device/battery/battery_status_manager_linux.cc +++ b/device/battery/battery_status_manager_linux.cc @@ -14,7 +14,7 @@ #include #include "base/macros.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread.h" #include "base/values.h" diff --git a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc index f2a688473b24e6..81e189eca6247c 100644 --- a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc +++ b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc @@ -16,7 +16,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.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/strings/stringprintf.h" diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.cc b/device/bluetooth/bluez/bluetooth_device_bluez.cc index 50b54cbb5d33ac..b060b2fe2d9bcb 100644 --- a/device/bluetooth/bluez/bluetooth_device_bluez.cc +++ b/device/bluetooth/bluez/bluetooth_device_bluez.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.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 "dbus/bus.h" diff --git a/device/bluetooth/bluez/bluetooth_pairing_bluez.cc b/device/bluetooth/bluez/bluetooth_pairing_bluez.cc index 611ad01a00cd80..2602ab9c4f9bd3 100644 --- a/device/bluetooth/bluez/bluetooth_pairing_bluez.cc +++ b/device/bluetooth/bluez/bluetooth_pairing_bluez.cc @@ -5,7 +5,7 @@ #include "device/bluetooth/bluez/bluetooth_pairing_bluez.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluez/bluetooth_device_bluez.h" diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index 5d9676e60f97bf..374d2ab84dcbfa 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "media/base/media_switches.h" #if defined(USE_ALSA) diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 9a353a14831478..fe05be26acb94b 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -18,7 +18,7 @@ #include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index e0cb8d779f697a..43bb7d7d610769 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -28,7 +28,7 @@ #include "base/macros.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index 3523f0dcd1af48..1f4069fcbeb6a2 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/metrics/histogram.h" +#include "base/metrics/histogram_macros.h" #include "base/strings/string16.h" #include "media/audio/audio_manager.h" #include "ui/aura/client/aura_constants.h"