Switch to standard integer types in base/android/.

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 "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "jni/RecordHistogram_jni.h"
 
 namespace base {
 namespace android {
 namespace {
@@ skipping 40 matching lines @@
   }
 
   HistogramBase* CustomCountHistogram(JNIEnv* env,
                                       jstring j_histogram_name,
                                       jint j_histogram_key,
                                       jint j_min,
                                       jint j_max,
                                       jint j_num_buckets) {
     DCHECK(j_histogram_name);
     DCHECK(j_histogram_key);
-    int64 min = static_cast<int64>(j_min);
-    int64 max = static_cast<int64>(j_max);
+    int64_t min = static_cast<int64_t>(j_min);
+    int64_t max = static_cast<int64_t>(j_max);
     int num_buckets = static_cast<int>(j_num_buckets);
     HistogramBase* histogram = FindLocked(j_histogram_key);
     if (histogram) {
       DCHECK(histogram->HasConstructionArguments(min, max, num_buckets));
       return histogram;
     }
 
     std::string histogram_name = ConvertJavaStringToUTF8(env, j_histogram_name);
     histogram =
         Histogram::FactoryGet(histogram_name, min, max, num_buckets,
                               HistogramBase::kUmaTargetedHistogramFlag);
     return InsertLocked(j_histogram_key, histogram);
   }
 
   HistogramBase* LinearCountHistogram(JNIEnv* env,
                                       jstring j_histogram_name,
                                       jint j_histogram_key,
                                       jint j_min,
                                       jint j_max,
                                       jint j_num_buckets) {
     DCHECK(j_histogram_name);
     DCHECK(j_histogram_key);
-    int64 min = static_cast<int64>(j_min);
-    int64 max = static_cast<int64>(j_max);
+    int64_t min = static_cast<int64_t>(j_min);
+    int64_t max = static_cast<int64_t>(j_max);
     int num_buckets = static_cast<int>(j_num_buckets);
     HistogramBase* histogram = FindLocked(j_histogram_key);
     if (histogram) {
       DCHECK(histogram->HasConstructionArguments(min, max, num_buckets));
       return histogram;
     }
 
     std::string histogram_name = ConvertJavaStringToUTF8(env, j_histogram_name);
     histogram =
         LinearHistogram::FactoryGet(histogram_name, min, max, num_buckets,
@@ skipping 18 matching lines @@
 
   HistogramBase* CustomTimesHistogram(JNIEnv* env,
                                       jstring j_histogram_name,
                                       jint j_histogram_key,
                                       jlong j_min,
                                       jlong j_max,
                                       jint j_bucket_count) {
     DCHECK(j_histogram_name);
     DCHECK(j_histogram_key);
     HistogramBase* histogram = FindLocked(j_histogram_key);
-    int64 min = static_cast<int64>(j_min);
-    int64 max = static_cast<int64>(j_max);
+    int64_t min = static_cast<int64_t>(j_min);
+    int64_t max = static_cast<int64_t>(j_max);
     int bucket_count = static_cast<int>(j_bucket_count);
     if (histogram) {
       DCHECK(histogram->HasConstructionArguments(min, max, bucket_count));
       return histogram;
     }
 
     std::string histogram_name = ConvertJavaStringToUTF8(env, j_histogram_name);
     // This intentionally uses FactoryGet and not FactoryTimeGet. FactoryTimeGet
     // is just a convenience for constructing the underlying Histogram with
     // TimeDelta arguments.
@@ skipping 97 matching lines @@
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& j_histogram_name,
     jint j_histogram_key,
     jlong j_duration,
     jlong j_min,
     jlong j_max,
     jint j_num_buckets) {
   g_histograms.Get()
       .CustomTimesHistogram(env, j_histogram_name, j_histogram_key, j_min,
                             j_max, j_num_buckets)
-      ->AddTime(TimeDelta::FromMilliseconds(static_cast<int64>(j_duration)));
+      ->AddTime(TimeDelta::FromMilliseconds(static_cast<int64_t>(j_duration)));
 }
 
 void Initialize(JNIEnv* env, const JavaParamRef<jclass>&) {
   StatisticsRecorder::Initialize();
 }
 
 // This backs a Java test util for testing histograms -
 // MetricsUtils.HistogramDelta. It should live in a test-specific file, but we
 // currently can't have test-specific native code packaged in test-specific Java
 // targets - see http://crbug.com/415945.
@@ skipping 12 matching lines @@
   scoped_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
   return samples->GetCount(static_cast<int>(sample));
 }
 
 bool RegisterRecordHistogram(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base