Revert "Refactor AnimationFrameTimeHistogram to use mockable static natives"

This reverts commit d958e2ee.

Reason for revert: Looks responsible for causing android-rel compile failure: https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/android-rel/4748

Original change's description:
> Refactor AnimationFrameTimeHistogram to use mockable static natives
> 
> This CL adds the necessary dependencies to use the JNI annotation
> processor in base/java and converts AnimationFrameTimeHistogram to
> use mockable static methods.
> 
> This abstraction should have little overhead once R8 is used instead
> of proguard but for now it still adds methods.
> 
> Bug: 898261
> Change-Id: I73141dfeb5916c40aafc3c58ae606fe0af7a392e
> Reviewed-on: https://chromium-review.googlesource.com/c/1347202
> Reviewed-by: agrieve <agrieve@chromium.org>
> Reviewed-by: Eric Stevenson <estevenson@chromium.org>
> Commit-Queue: Aiden Benner <abenner@google.com>
> Cr-Commit-Position: refs/heads/master@{#610514}

TBR=agrieve@chromium.org,estevenson@chromium.org,abenner@google.com

Change-Id: I3731924e03a3ab084bc761ae441f6bf71970ab27
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 898261
Reviewed-on: https://chromium-review.googlesource.com/c/1348886Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610517}

base/BUILD.gn

@@ -2921,7 +2921,6 @@ if (is_android) {
     ]
 
     deps = [
-      ":jni_java",
       "//third_party/android_deps:android_support_annotations_java",
       "//third_party/android_deps:android_support_multidex_java",
       "//third_party/android_deps:android_support_v4_java",
@@ -2951,6 +2950,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/IntStringCallback.java",
+      "android/java/src/org/chromium/base/JniStaticTestMocker.java",
       "android/java/src/org/chromium/base/JNIUtils.java",
       "android/java/src/org/chromium/base/JavaExceptionReporter.java",
       "android/java/src/org/chromium/base/JavaHandlerThread.java",
@@ -2985,6 +2985,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
       "android/java/src/org/chromium/base/annotations/JNINamespace.java",
       "android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
+      "android/java/src/org/chromium/base/annotations/JniStaticNatives.java",
       "android/java/src/org/chromium/base/annotations/MainDex.java",
       "android/java/src/org/chromium/base/annotations/NativeCall.java",
       "android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
@@ -3030,8 +3031,6 @@ if (is_android) {
       "android/java/src/org/chromium/base/task/TaskTraits.java",
     ]
 
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-
     # New versions of BuildConfig.java and NativeLibraries.java
     # (with the actual correct values) will be created when creating an apk.
     jar_excluded_patterns = [

base/android/animation_frame_time_histogram.cc

@@ -11,7 +11,7 @@ using base::android::JavaParamRef;
 // static
 void JNI_AnimationFrameTimeHistogram_SaveHistogram(
     JNIEnv* env,
-    const base::android::JavaParamRef<jclass>& jcaller,
+    const JavaParamRef<jobject>& jcaller,
     const JavaParamRef<jstring>& j_histogram_name,
     const JavaParamRef<jlongArray>& j_frame_times_ms,
     jint j_count) {

base/android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java

@@ -11,8 +11,6 @@ import android.animation.TimeAnimator;
 import android.animation.TimeAnimator.TimeListener;
 import android.util.Log;
 
-import org.chromium.base.annotations.JniStaticNatives;
-
 /**
  * Record Android animation frame rate and save it to UMA histogram. This is mainly for monitoring
  * any jankiness of short Chrome Android animations. It is limited to few seconds of recording.
@@ -73,8 +71,8 @@ public class AnimationFrameTimeHistogram {
      */
     public void endRecording() {
         if (mRecorder.endRecording()) {
-            AnimationFrameTimeHistogramJni.get().saveHistogram(
-                    mHistogramName, mRecorder.getFrameTimesMs(), mRecorder.getFrameTimesCount());
+            nativeSaveHistogram(mHistogramName,
+                    mRecorder.getFrameTimesMs(), mRecorder.getFrameTimesCount());
         }
         mRecorder.cleanUp();
     }
@@ -143,8 +141,5 @@ public class AnimationFrameTimeHistogram {
         }
     }
 
-    @JniStaticNatives
-    interface Natives {
-        void saveHistogram(String histogramName, long[] frameTimesMs, int count);
-    }
+    private native void nativeSaveHistogram(String histogramName, long[] frameTimesMs, int count);
 }

base/android/jni_generator/BUILD.gn

@@ -23,7 +23,6 @@ android_library("jni_sample_java") {
 
   deps = [
     "//base:base_java",
-    "//base:jni_java",
   ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -33,7 +32,6 @@ android_library("jni_annotation_sample_java") {
   java_files = [ "java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java" ]
   deps = [
     "//base:base_java",
-    "//base:jni_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
@@ -68,7 +66,6 @@ android_apk("sample_jni_apk") {
   deps = [
     ":jni_sample_java",
     "//base:base_java",
-    "//base:jni_java",
   ]
   shared_libraries = [ ":jni_sample_lib" ]
   jni_registration_header = _registration_header