Histogram - back out the temporary debug changes.

Revert revision 152884.
Revert revision 153038.

The real root cause of the bug has been determined to be
similar to that in bug 140301. Thus the debug changes are no longer needed.

BUG=143714

Review URL: https://chromiumcodereview.appspot.com/10875016

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

1 files changed, 2 insertions, 23 deletions

diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index acbd293..dbc76ef 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -155,19 +155,6 @@ void CheckCorruption(const Histogram& histogram, bool new_histogram) {
   CHECK(histogram.bucket_ranges()->HasValidChecksum());
 }
 
-// TODO(hshi): http://crbug.com/143714 delete this code after debugging.
-void CheckOrDumpHistogram(const Histogram& histogram, bool status) {
-  if (status)
-    return;
-  const std::string& histogram_name = histogram.histogram_name();
-  char histogram_name_buf[128];
-  base::strlcpy(histogram_name_buf,
-                histogram_name.c_str(),
-                arraysize(histogram_name_buf));
-  base::debug::Alias(histogram_name_buf);
-  CHECK(false);
-}
-
 Histogram* Histogram::FactoryGet(const string& name,
                                  Sample minimum,
                                  Sample maximum,
@@ -197,11 +184,7 @@ Histogram* Histogram::FactoryGet(const string& name,
   CheckCorruption(*histogram, false);
 
   CHECK_EQ(HISTOGRAM, histogram->histogram_type());
-
-  // TODO(hshi): http://crbug.com/143714 delete this code after debugging.
-  bool has_construction_arguments =
-      histogram->HasConstructionArguments(minimum, maximum, bucket_count);
-  CheckOrDumpHistogram(*histogram, has_construction_arguments);
+  CHECK(histogram->HasConstructionArguments(minimum, maximum, bucket_count));
   return histogram;
 }
 
@@ -757,11 +740,7 @@ Histogram* LinearHistogram::FactoryGet(const string& name,
   CheckCorruption(*histogram, false);
 
   CHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type());
-
-  // TODO(hshi): http://crbug.com/143714 delete this code after debugging.
-  bool has_construction_arguments =
-      histogram->HasConstructionArguments(minimum, maximum, bucket_count);
-  CheckOrDumpHistogram(*histogram, has_construction_arguments);
+  CHECK(histogram->HasConstructionArguments(minimum, maximum, bucket_count));
   return histogram;
 }