Android: Fix missing GN dep for JniCallbackUtil_jni.h

Noticed this closed the tree:
https://ci.chromium.org/ui/p/chromium/builders/ci/android-cast-arm-rel/7281/overview

Can repro failure via:
autoninja robolectric_x64/obj/base/base/jni_callback.o

Moved IntStringCallback to robolectric as well, since why not.

Bug: None
Change-Id: I95d90fd73ce85a79e3cb245c762a5fb7f9fbf08d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6292419
Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1423412}

base/BUILD.gn

@@ -1163,8 +1163,6 @@ component("base") {
       "android/important_file_writer_android.cc",
       "android/input_hint_checker.cc",
       "android/input_hint_checker.h",
-      "android/int_string_callback.cc",
-      "android/int_string_callback.h",
       "android/jank_metric_uma_recorder.cc",
       "android/jank_metric_uma_recorder.h",
       "android/java_handler_thread.cc",
@@ -1302,6 +1300,8 @@ component("base") {
       "android/callback_android.cc",
       "android/callback_android.h",
       "android/command_line_android.cc",
+      "android/int_string_callback.cc",
+      "android/int_string_callback.h",
       "android/java_exception_reporter.cc",
       "android/java_exception_reporter.h",
       "android/jni_android.cc",
@@ -4311,9 +4311,13 @@ if (is_android) {
   generate_jni("base_minimal_jni") {
     enable_definition_macros = true
     sources = [
+      "android/java/src/org/chromium/base/IntStringCallback.java",
       "android/java/src/org/chromium/base/JNIUtils.java",
       "android/java/src/org/chromium/base/JavaExceptionReporter.java",
       "android/java/src/org/chromium/base/JniAndroid.java",
+      "android/java/src/org/chromium/base/JniCallbackUtils.java",
+      "android/java/src/org/chromium/base/JniOnceCallback.java",
+      "android/java/src/org/chromium/base/JniRepeatingCallback.java",
       "android/java/src/org/chromium/base/Token.java",
       "android/java/src/org/chromium/base/TokenBase.java",
       "android/java/src/org/chromium/base/UnguessableToken.java",
@@ -4336,11 +4340,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/FileUtils.java",
       "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
       "android/java/src/org/chromium/base/InputHintChecker.java",
-      "android/java/src/org/chromium/base/IntStringCallback.java",
       "android/java/src/org/chromium/base/JavaHandlerThread.java",
-      "android/java/src/org/chromium/base/JniCallbackUtils.java",
-      "android/java/src/org/chromium/base/JniOnceCallback.java",
-      "android/java/src/org/chromium/base/JniRepeatingCallback.java",
       "android/java/src/org/chromium/base/LocaleUtils.java",
       "android/java/src/org/chromium/base/PathService.java",
       "android/java/src/org/chromium/base/PathUtils.java",

base/android/int_string_callback.cc

@@ -13,7 +13,7 @@
 #include "base/android/jni_string.h"
 
 // Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/IntStringCallback_jni.h"
+#include "base/base_minimal_jni/IntStringCallback_jni.h"
 
 namespace base {
 namespace android {
@@ -27,3 +27,5 @@ void RunIntStringCallbackAndroid(const JavaRef<jobject>& callback,
 
 }  // namespace android
 }  // namespace base
+
+DEFINE_JNI_FOR_IntStringCallback()

base/android/jni_callback.cc

@@ -5,9 +5,9 @@
 #include "base/android/jni_callback.h"
 
 // Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/JniCallbackUtils_jni.h"
-#include "base/base_jni/JniOnceCallback_jni.h"
-#include "base/base_jni/JniRepeatingCallback_jni.h"
+#include "base/base_minimal_jni/JniCallbackUtils_jni.h"
+#include "base/base_minimal_jni/JniOnceCallback_jni.h"
+#include "base/base_minimal_jni/JniRepeatingCallback_jni.h"
 
 namespace base::android {
 
@@ -110,3 +110,7 @@ void JNI_JniCallbackUtils_Destroy(JNIEnv* env,
 }
 
 }  // namespace base::android
+
+DEFINE_JNI_FOR_JniCallbackUtils()
+DEFINE_JNI_FOR_JniOnceCallback()
+DEFINE_JNI_FOR_JniRepeatingCallback()