Index: base/android/record_histogram.cc |
diff --git a/base/android/record_histogram.cc b/base/android/record_histogram.cc |
index 5679762ee07c1ecc0b604bb842d20e9323a67ec5..1a207a18dc42b5d7fb91dd4cff45130017bc6c4c 100644 |
--- a/base/android/record_histogram.cc |
+++ b/base/android/record_histogram.cc |
@@ -53,12 +53,16 @@ class HistogramCache { |
jstring j_histogram_name, |
int32_t expected_min, |
int32_t expected_max, |
- int32_t expected_bucket_count, |
+ uint32_t expected_bucket_count, |
HistogramBase* histogram) { |
+ std::string histogram_name = ConvertJavaStringToUTF8(env, j_histogram_name); |
+ bool valid_arguments = Histogram::InspectConstructionArguments( |
+ histogram_name, &expected_min, &expected_max, &expected_bucket_count); |
+ DCHECK(valid_arguments); |
DCHECK(histogram->HasConstructionArguments(expected_min, expected_max, |
expected_bucket_count)) |
- << ConvertJavaStringToUTF8(env, j_histogram_name) << "/" << expected_min |
- << "/" << expected_max << "/" << expected_bucket_count << " vs. " |
+ << histogram_name << "/" << expected_min << "/" << expected_max << "/" |
+ << expected_bucket_count << " vs. " |
<< HistogramConstructionParamsToString(histogram); |
} |