diff options
| author | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 04:12:17 +0000 |
|---|---|---|
| committer | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 04:12:17 +0000 |
| commit | de415556289c07f6a28bec79405d413460b186d2 (patch) | |
| tree | 6664e471f3383e96c9f768750ad25d75cab567dc /net/cookies | |
| parent | 042b62dec29c560ccf3e5bfdbf658c11adb56f0b (diff) | |
| download | chromium_src-de415556289c07f6a28bec79405d413460b186d2.zip chromium_src-de415556289c07f6a28bec79405d413460b186d2.tar.gz chromium_src-de415556289c07f6a28bec79405d413460b186d2.tar.bz2 | |
Only HistogramBase is used outside of base/metrics.
So client code of histogram will see a simpler interface. This also makes adding SparseHistogram to existing metrics framework possible.
This CL depends on https://codereview.chromium.org/11682003/
So please review that one first.
TBR=sky@chromium.org,erikwright@chromium.org
BUG=139612
Review URL: https://chromiumcodereview.appspot.com/11615008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies')
| -rw-r--r-- | net/cookies/cookie_monster.h | 25 | ||||
| -rw-r--r-- | net/cookies/cookie_monster_unittest.cc | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index 10a6350..8a400c2 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h @@ -30,6 +30,7 @@ class GURL; namespace base { class Histogram; +class HistogramBase; class TimeTicks; } // namespace base @@ -575,18 +576,18 @@ class NET_EXPORT CookieMonster : public CookieStore { // Histogram variables; see CookieMonster::InitializeHistograms() in // cookie_monster.cc for details. - base::Histogram* histogram_expiration_duration_minutes_; - base::Histogram* histogram_between_access_interval_minutes_; - base::Histogram* histogram_evicted_last_access_minutes_; - base::Histogram* histogram_count_; - base::Histogram* histogram_domain_count_; - base::Histogram* histogram_etldp1_count_; - base::Histogram* histogram_domain_per_etldp1_count_; - base::Histogram* histogram_number_duplicate_db_cookies_; - base::Histogram* histogram_cookie_deletion_cause_; - base::Histogram* histogram_time_get_; - base::Histogram* histogram_time_mac_; - base::Histogram* histogram_time_blocked_on_load_; + base::HistogramBase* histogram_expiration_duration_minutes_; + base::HistogramBase* histogram_between_access_interval_minutes_; + base::HistogramBase* histogram_evicted_last_access_minutes_; + base::HistogramBase* histogram_count_; + base::HistogramBase* histogram_domain_count_; + base::HistogramBase* histogram_etldp1_count_; + base::HistogramBase* histogram_domain_per_etldp1_count_; + base::HistogramBase* histogram_number_duplicate_db_cookies_; + base::HistogramBase* histogram_cookie_deletion_cause_; + base::HistogramBase* histogram_time_get_; + base::HistogramBase* histogram_time_mac_; + base::HistogramBase* histogram_time_blocked_on_load_; CookieMap cookies_; diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index 62140cd..d02b511 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -1922,7 +1922,7 @@ TEST_F(CookieMonsterTest, HistogramCheck) { // Should match call in InitializeHistograms, but doesn't really matter // since the histogram should have been initialized by the CM construction // above. - base::Histogram* expired_histogram = + base::HistogramBase* expired_histogram = base::Histogram::FactoryGet( "Cookie.ExpirationDurationMinutes", 1, 10 * 365 * 24 * 60, 50, base::Histogram::kUmaTargetedHistogramFlag); |