summaryrefslogtreecommitdiffstats
path: root/components/content_settings
diff options
context:
space:
mode:
authorasvitkine <asvitkine@chromium.org>2015-06-16 14:45:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-16 21:46:16 +0000
commita0f05db0971c18d51c646f457f72587323a88fef (patch)
treec757fc304ab2b796806c2bd1a91e77bca2506f55 /components/content_settings
parent228414fc8870f88f11ada7512e88ea6999890f56 (diff)
downloadchromium_src-a0f05db0971c18d51c646f457f72587323a88fef.zip
chromium_src-a0f05db0971c18d51c646f457f72587323a88fef.tar.gz
chromium_src-a0f05db0971c18d51c646f457f72587323a88fef.tar.bz2
Change histogram.h includes to histogram_macros.h in components/
BUG=416479 Review URL: https://codereview.chromium.org/1178683009 Cr-Commit-Position: refs/heads/master@{#334703}
Diffstat (limited to 'components/content_settings')
-rw-r--r--components/content_settings/core/browser/content_settings_default_provider.cc2
-rw-r--r--components/content_settings/core/browser/content_settings_pref.cc2
-rw-r--r--components/content_settings/core/browser/content_settings_pref_provider.cc2
3 files changed, 3 insertions, 3 deletions
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"