summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorasvitkine <asvitkine@chromium.org>2015-06-16 09:34:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-16 16:35:16 +0000
commit454600f473d0ebd339272129250d9672405e8fe1 (patch)
treed40c7e5d2ba9a263af8e914330de0539918863c0 /base
parente293d42a19abd621c7e14d137c29ac29da29939f (diff)
downloadchromium_src-454600f473d0ebd339272129250d9672405e8fe1.zip
chromium_src-454600f473d0ebd339272129250d9672405e8fe1.tar.gz
chromium_src-454600f473d0ebd339272129250d9672405e8fe1.tar.bz2
Change histogram.h includes to histogram_macros.h in metrics code.
BUG=416479 Review URL: https://codereview.chromium.org/1189653002 Cr-Commit-Position: refs/heads/master@{#334618}
Diffstat (limited to 'base')
-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
5 files changed, 5 insertions, 3 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"