summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/metrics/histogram.cc1
-rw-r--r--base/metrics/histogram_snapshot_manager_unittest.cc2
-rw-r--r--base/metrics/histogram_unittest.cc1
-rw-r--r--base/metrics/statistics_recorder_unittest.cc2
-rw-r--r--base/test/histogram_tester_unittest.cc2
-rw-r--r--components/metrics/cloned_install_detector.cc2
-rw-r--r--components/metrics/metrics_log_manager.cc2
-rw-r--r--components/metrics/metrics_reporting_scheduler.cc2
-rw-r--r--components/metrics/metrics_service.cc2
-rw-r--r--components/metrics/metrics_state_manager.cc2
-rw-r--r--components/metrics/net/net_metrics_log_uploader.cc2
-rw-r--r--components/metrics/persisted_logs.cc2
-rw-r--r--components/rappor/log_uploader.cc2
-rw-r--r--components/rappor/rappor_prefs.cc2
-rw-r--r--components/variations/net/variations_http_header_provider.cc2
15 files changed, 15 insertions, 13 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index 1550420..0a14f22 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -17,6 +17,7 @@
#include "base/compiler_specific.h"
#include "base/debug/alias.h"
#include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/sample_vector.h"
#include "base/metrics/statistics_recorder.h"
#include "base/pickle.h"
diff --git a/base/metrics/histogram_snapshot_manager_unittest.cc b/base/metrics/histogram_snapshot_manager_unittest.cc
index 3a1fd40..e9e7398 100644
--- a/base/metrics/histogram_snapshot_manager_unittest.cc
+++ b/base/metrics/histogram_snapshot_manager_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/metrics/histogram.h"
#include "base/metrics/histogram_delta_serialization.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/statistics_recorder.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/metrics/histogram_unittest.cc b/base/metrics/histogram_unittest.cc
index 2e3a1ee..f189267 100644
--- a/base/metrics/histogram_unittest.cc
+++ b/base/metrics/histogram_unittest.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/bucket_ranges.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/sample_vector.h"
#include "base/metrics/statistics_recorder.h"
#include "base/pickle.h"
diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc
index d26df69..25988e8 100644
--- a/base/metrics/statistics_recorder_unittest.cc
+++ b/base/metrics/statistics_recorder_unittest.cc
@@ -6,7 +6,7 @@
#include "base/json/json_reader.h"
#include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/statistics_recorder.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/test/histogram_tester_unittest.cc b/base/test/histogram_tester_unittest.cc
index a03ee13..e26828c 100644
--- a/base/test/histogram_tester_unittest.cc
+++ b/base/test/histogram_tester_unittest.cc
@@ -5,7 +5,7 @@
#include "base/test/histogram_tester.h"
#include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/histogram_samples.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/metrics/cloned_install_detector.cc b/components/metrics/cloned_install_detector.cc
index be89bb9..16598b4 100644
--- a/components/metrics/cloned_install_detector.cc
+++ b/components/metrics/cloned_install_detector.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/location.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"
diff --git a/components/metrics/metrics_log_manager.cc b/components/metrics/metrics_log_manager.cc
index e833ec3..67ffed2 100644
--- a/components/metrics/metrics_log_manager.cc
+++ b/components/metrics/metrics_log_manager.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/timer/elapsed_timer.h"
#include "components/metrics/metrics_log.h"
diff --git a/components/metrics/metrics_reporting_scheduler.cc b/components/metrics/metrics_reporting_scheduler.cc
index 1318b22..eafef42 100644
--- a/components/metrics/metrics_reporting_scheduler.cc
+++ b/components/metrics/metrics_reporting_scheduler.cc
@@ -5,7 +5,7 @@
#include "components/metrics/metrics_reporting_scheduler.h"
#include "base/compiler_specific.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "components/variations/variations_associated_data.h"
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
index 2938b2c..7894279 100644
--- a/components/metrics/metrics_service.cc
+++ b/components/metrics/metrics_service.cc
@@ -129,8 +129,8 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/metrics/histogram.h"
#include "base/metrics/histogram_base.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/sparse_histogram.h"
#include "base/metrics/statistics_recorder.h"
diff --git a/components/metrics/metrics_state_manager.cc b/components/metrics/metrics_state_manager.cc
index fdb972f..3193115 100644
--- a/components/metrics/metrics_state_manager.cc
+++ b/components/metrics/metrics_state_manager.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/guid.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/prefs/pref_service.h"
diff --git a/components/metrics/net/net_metrics_log_uploader.cc b/components/metrics/net/net_metrics_log_uploader.cc
index 9d0027e..eca2774 100644
--- a/components/metrics/net/net_metrics_log_uploader.cc
+++ b/components/metrics/net/net_metrics_log_uploader.cc
@@ -4,7 +4,7 @@
#include "components/metrics/net/net_metrics_log_uploader.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "net/base/load_flags.h"
#include "net/base/network_change_notifier.h"
#include "net/url_request/url_fetcher.h"
diff --git a/components/metrics/persisted_logs.cc b/components/metrics/persisted_logs.cc
index c494aee..d2d79e6 100644
--- a/components/metrics/persisted_logs.cc
+++ b/components/metrics/persisted_logs.cc
@@ -8,7 +8,7 @@
#include "base/base64.h"
#include "base/md5.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/sha1.h"
diff --git a/components/rappor/log_uploader.cc b/components/rappor/log_uploader.cc
index 58e5455..9211184 100644
--- a/components/rappor/log_uploader.cc
+++ b/components/rappor/log_uploader.cc
@@ -4,7 +4,7 @@
#include "components/rappor/log_uploader.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
diff --git a/components/rappor/rappor_prefs.cc b/components/rappor/rappor_prefs.cc
index b9e3e00c..3606b32 100644
--- a/components/rappor/rappor_prefs.cc
+++ b/components/rappor/rappor_prefs.cc
@@ -5,7 +5,7 @@
#include "components/rappor/rappor_prefs.h"
#include "base/base64.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/rand_util.h"
diff --git a/components/variations/net/variations_http_header_provider.cc b/components/variations/net/variations_http_header_provider.cc
index 00aa5d6..fd7be82 100644
--- a/components/variations/net/variations_http_header_provider.cc
+++ b/components/variations/net/variations_http_header_provider.cc
@@ -10,7 +10,7 @@
#include "base/base64.h"
#include "base/memory/singleton.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
generated by cgit v1.1 at 2025-01-24 03:39:46 +0000