Migrate Windows to histogram_macros.h includes.

Updates ifdef in histogram.h to prevent this from regressing for Windows. The ifdef will be updated incrementally as each platform becomes fully migrated. BUG=416479 TBR=sadrul@chromium.org,thestig@chromium.org,dalecurtis@chromium.org,piman@chromium.org,reillyg@chromium.org Review-Url: https://codereview.chromium.org/2643303004 Cr-Commit-Position: refs/heads/master@{#445187}
Denger-Network · Jan 20, 2017 · 755527a · 755527a
1 parent 6d1c9ad
commit 755527a
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc
@@ -11,7 +11,7 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/current_module.h"

diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
@@ -81,7 +81,7 @@
 #include "base/macros.h"
 #include "base/metrics/bucket_ranges.h"
 #include "base/metrics/histogram_base.h"
-#if defined(OS_CHROMEOS) || defined(OS_IOS) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_IOS)
 // 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/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
@@ -24,7 +24,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"

diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
@@ -11,7 +11,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
@@ -17,7 +17,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/process/launch.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/components/metrics/clean_exit_beacon.cc b/components/metrics/clean_exit_beacon.cc
@@ -10,7 +10,7 @@
 #include "components/prefs/pref_service.h"
 
 #if defined(OS_WIN)
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #endif

diff --git a/components/storage_monitor/volume_mount_watcher_win.cc b/components/storage_monitor/volume_mount_watcher_win.cc
@@ -16,7 +16,7 @@
 #include <algorithm>
 
 #include "base/bind_helpers.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"

diff --git a/device/battery/battery_status_manager_win.cc b/device/battery/battery_status_manager_win.cc
@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/win/message_window.h"
 #include "base/win/windows_version.h"

diff --git a/device/geolocation/wifi_data_provider_win.cc b/device/geolocation/wifi_data_provider_win.cc
@@ -28,7 +28,7 @@
 #include <wlanapi.h>
 
 #include "base/memory/free_deleter.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "device/geolocation/wifi_data_provider_common.h"

diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc
@@ -23,7 +23,7 @@
 #include "base/logging.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/scoped_native_library.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
@@ -18,7 +18,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc
@@ -10,7 +10,7 @@
 
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/win/scoped_co_mem.h"

diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc
@@ -5,7 +5,7 @@
 #include "ui/views/widget/desktop_aura/desktop_drop_target_win.h"
 
 #include "base/memory/ptr_util.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/win/win_util.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/drag_drop_delegate.h"