Revert JNI refactor for AwContentsClientBridge.java

Reverting whole CL has merge conflicts, so quickly reverting this one
more known bad file.

NOTRY=true
NOPRESUBMIT=true
TBR=estevenson

Bug: 1000471
Change-Id: Ica8158d081cb4e7c833787e8196e2cbf792093bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786671Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693733}

android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

@@ -14,7 +14,6 @@ import org.chromium.base.Callback;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeUnchecked;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.PostTask;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -135,9 +134,8 @@ public class AwContentsClientBridge {
 
         private void provideResponse(PrivateKey privateKey, byte[][] certChain) {
             if (mNativeContentsClientBridge == 0) return;
-            AwContentsClientBridgeJni.get().provideClientCertificateResponse(
-                    mNativeContentsClientBridge, AwContentsClientBridge.this, mId, certChain,
-                    privateKey);
+            nativeProvideClientCertificateResponse(mNativeContentsClientBridge, mId,
+                    certChain, privateKey);
         }
     }
 
@@ -180,8 +178,7 @@ public class AwContentsClientBridge {
 
     private void proceedSslError(boolean proceed, int id) {
         if (mNativeContentsClientBridge == 0) return;
-        AwContentsClientBridgeJni.get().proceedSslError(
-                mNativeContentsClientBridge, AwContentsClientBridge.this, proceed, id);
+        nativeProceedSslError(mNativeContentsClientBridge, proceed, id);
     }
 
     // Intentionally not private for testing the native peer of this class.
@@ -191,14 +188,13 @@ public class AwContentsClientBridge {
         assert mNativeContentsClientBridge != 0;
         ClientCertLookupTable.Cert cert = mLookupTable.getCertData(host, port);
         if (mLookupTable.isDenied(host, port)) {
-            AwContentsClientBridgeJni.get().provideClientCertificateResponse(
-                    mNativeContentsClientBridge, AwContentsClientBridge.this, id, null, null);
+            nativeProvideClientCertificateResponse(mNativeContentsClientBridge, id,
+                    null, null);
             return;
         }
         if (cert != null) {
-            AwContentsClientBridgeJni.get().provideClientCertificateResponse(
-                    mNativeContentsClientBridge, AwContentsClientBridge.this, id, cert.mCertChain,
-                    cert.mPrivateKey);
+            nativeProvideClientCertificateResponse(mNativeContentsClientBridge, id,
+                    cert.mCertChain, cert.mPrivateKey);
             return;
         }
         // Build the list of principals from encoded versions.
@@ -210,9 +206,8 @@ public class AwContentsClientBridge {
                     principals[n] = new X500Principal(encodedPrincipals[n]);
                 } catch (IllegalArgumentException e) {
                     Log.w(TAG, "Exception while decoding issuers list: " + e);
-                    AwContentsClientBridgeJni.get().provideClientCertificateResponse(
-                            mNativeContentsClientBridge, AwContentsClientBridge.this, id, null,
-                            null);
+                    nativeProvideClientCertificateResponse(mNativeContentsClientBridge, id,
+                            null, null);
                     return;
                 }
             }
@@ -354,8 +349,7 @@ public class AwContentsClientBridge {
         // clang-format off
         Callback<AwSafeBrowsingResponse> callback =
                 response -> PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT,
-                        () -> AwContentsClientBridgeJni.get().takeSafeBrowsingAction(
-                                mNativeContentsClientBridge, AwContentsClientBridge.this,
+                        () -> nativeTakeSafeBrowsingAction(mNativeContentsClientBridge,
                                 response.action(), response.reporting(), requestId));
         // clang-format on
 
@@ -410,28 +404,25 @@ public class AwContentsClientBridge {
 
     void confirmJsResult(int id, String prompt) {
         if (mNativeContentsClientBridge == 0) return;
-        AwContentsClientBridgeJni.get().confirmJsResult(
-                mNativeContentsClientBridge, AwContentsClientBridge.this, id, prompt);
+        nativeConfirmJsResult(mNativeContentsClientBridge, id, prompt);
     }
 
     void cancelJsResult(int id) {
         if (mNativeContentsClientBridge == 0) return;
-        AwContentsClientBridgeJni.get().cancelJsResult(
-                mNativeContentsClientBridge, AwContentsClientBridge.this, id);
+        nativeCancelJsResult(mNativeContentsClientBridge, id);
     }
 
-    @NativeMethods
-    interface Natives {
-        void takeSafeBrowsingAction(long nativeAwContentsClientBridge,
-                AwContentsClientBridge caller, int action, boolean reporting, int requestId);
-
-        void proceedSslError(long nativeAwContentsClientBridge, AwContentsClientBridge caller,
-                boolean proceed, int id);
-        void provideClientCertificateResponse(long nativeAwContentsClientBridge,
-                AwContentsClientBridge caller, int id, byte[][] certChain, PrivateKey androidKey);
-        void confirmJsResult(long nativeAwContentsClientBridge, AwContentsClientBridge caller,
-                int id, String prompt);
-        void cancelJsResult(
-                long nativeAwContentsClientBridge, AwContentsClientBridge caller, int id);
-    }
+    //--------------------------------------------------------------------------------------------
+    //  Native methods
+    //--------------------------------------------------------------------------------------------
+    private native void nativeTakeSafeBrowsingAction(
+            long nativeAwContentsClientBridge, int action, boolean reporting, int requestId);
+    private native void nativeProceedSslError(long nativeAwContentsClientBridge, boolean proceed,
+            int id);
+    private native void nativeProvideClientCertificateResponse(long nativeAwContentsClientBridge,
+            int id, byte[][] certChain, PrivateKey androidKey);
+
+    private native void nativeConfirmJsResult(long nativeAwContentsClientBridge, int id,
+            String prompt);
+    private native void nativeCancelJsResult(long nativeAwContentsClientBridge, int id);
 }