Switch to standard integer types in base/android/.

base/android/base_jni_registrar.cc

 // Copyright (c) 2012 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/base_jni_registrar.h"
 
 #include "base/android/animation_frame_time_histogram.h"
 #include "base/android/apk_assets.h"
 #include "base/android/application_status_listener.h"
 #include "base/android/build_info.h"
@@ skipping 11 matching lines @@
 #include "base/android/jni_utils.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/android/path_service_android.h"
 #include "base/android/path_utils.h"
 #include "base/android/record_histogram.h"
 #include "base/android/record_user_action.h"
 #include "base/android/sys_utils.h"
 #include "base/android/thread_utils.h"
 #include "base/android/trace_event_binding.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/message_loop/message_pump_android.h"
 #include "base/power_monitor/power_monitor_device_source_android.h"
 #include "base/trace_event/trace_event.h"
 
 namespace base {
 namespace android {
 
 static RegistrationMethod kBaseRegisteredMethods[] = {
     {"AnimationFrameTimeHistogram",
      base::android::RegisterAnimationFrameTimeHistogram},
@@ skipping 27 matching lines @@
 };
 
 bool RegisterJni(JNIEnv* env) {
   TRACE_EVENT0("startup", "base_android::RegisterJni");
   return RegisterNativeMethods(env, kBaseRegisteredMethods,
                                arraysize(kBaseRegisteredMethods));
 }
 
 }  // namespace android
 }  // namespace base