Revert 78460 - Removed the static on all histogram macros. If this change

sticks, then we could stop using these macros and will change
all the code that use histogram macros.

We wanted to see how much impact this CL had on performance. Will
reland the change again to fix the memory corruption crashes in
net area.

BUG=76092
TEST=histogram unit tests and watch out if this change 
     has performance impact. We did a trial run of this patch
     and we didn't see any impact in performance bots.
R=jar

Review URL: http://codereview.chromium.org/6667061

TBR=rtenneti@chromium.org
Review URL: http://codereview.chromium.org/6718009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 10 deletions

diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index ebe174c..347932a 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -65,7 +65,7 @@ class Lock;
     name, sample, 1, 10000, 50)
 
 #define HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::Histogram::FactoryGet(name, min, max, bucket_count, \
                                     base::Histogram::kNoFlags); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -78,7 +78,7 @@ class Lock;
 // For folks that need real specific times, use this to select a precise range
 // of times you want plotted, and the number of buckets you want used.
 #define HISTOGRAM_CUSTOM_TIMES(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::Histogram::FactoryTimeGet(name, min, max, bucket_count, \
                                         base::Histogram::kNoFlags); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -87,7 +87,7 @@ class Lock;
 
 // DO NOT USE THIS.  It is being phased out, in favor of HISTOGRAM_CUSTOM_TIMES.
 #define HISTOGRAM_CLIPPED_TIMES(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::Histogram::FactoryTimeGet(name, min, max, bucket_count, \
                                         base::Histogram::kNoFlags); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -98,7 +98,7 @@ class Lock;
 // less than boundary_value.
 
 #define HISTOGRAM_ENUMERATION(name, sample, boundary_value) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::LinearHistogram::FactoryGet(name, 1, boundary_value, \
                                           boundary_value + 1, \
                                           base::Histogram::kNoFlags); \
@@ -107,7 +107,7 @@ class Lock;
   } while (0)
 
 #define HISTOGRAM_CUSTOM_ENUMERATION(name, sample, custom_ranges) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::CustomHistogram::FactoryGet(name, custom_ranges, \
                                           base::Histogram::kNoFlags); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -171,7 +171,7 @@ class Lock;
     base::TimeDelta::FromHours(1), 50)
 
 #define UMA_HISTOGRAM_CUSTOM_TIMES(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::Histogram::FactoryTimeGet(name, min, max, bucket_count, \
             base::Histogram::kUmaTargetedHistogramFlag); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -180,7 +180,7 @@ class Lock;
 
 // DO NOT USE THIS.  It is being phased out, in favor of HISTOGRAM_CUSTOM_TIMES.
 #define UMA_HISTOGRAM_CLIPPED_TIMES(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::Histogram::FactoryTimeGet(name, min, max, bucket_count, \
             base::Histogram::kUmaTargetedHistogramFlag); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -197,7 +197,7 @@ class Lock;
     name, sample, 1, 10000, 50)
 
 #define UMA_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
        base::Histogram::FactoryGet(name, min, max, bucket_count, \
            base::Histogram::kUmaTargetedHistogramFlag); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -214,7 +214,7 @@ class Lock;
     UMA_HISTOGRAM_ENUMERATION(name, under_one_hundred, 101)
 
 #define UMA_HISTOGRAM_ENUMERATION(name, sample, boundary_value) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::LinearHistogram::FactoryGet(name, 1, boundary_value, \
             boundary_value + 1, base::Histogram::kUmaTargetedHistogramFlag); \
     DCHECK_EQ(name, counter->histogram_name()); \
@@ -222,7 +222,7 @@ class Lock;
   } while (0)
 
 #define UMA_HISTOGRAM_CUSTOM_ENUMERATION(name, sample, custom_ranges) do { \
-    scoped_refptr<base::Histogram> counter = \
+    static scoped_refptr<base::Histogram> counter = \
         base::CustomHistogram::FactoryGet(name, custom_ranges, \
             base::Histogram::kUmaTargetedHistogramFlag); \
     DCHECK_EQ(name, counter->histogram_name()); \