Fixing mismatch between expected and declared minimum values.

base/android/record_histogram.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/record_histogram.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 35 matching lines @@
       case SPARSE_HISTOGRAM:
         break;
     }
     return params_str;
   }
 
   void CheckHistogramArgs(JNIEnv* env,
                           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);
   }
 
   HistogramBase* BooleanHistogram(JNIEnv* env,
                                   jstring j_histogram_name,
                                   jlong j_histogram_key) {
     DCHECK(j_histogram_name);
     HistogramBase* histogram = HistogramFromKey(j_histogram_key);
     if (histogram)
       return histogram;
@@ skipping 238 matching lines @@
   std::unique_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
   return samples->GetCount(static_cast<int>(sample));
 }
 
 bool RegisterRecordHistogram(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base