Use Network instead of network handle in AwPacProcessor.

See b/165192953.

Bug: 1085115
Change-Id: I56a7f3108d408a56c3663921a86ba8fd44f1530a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362915Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799568}

android_webview/java/src/org/chromium/android_webview/AwPacProcessor.java

@@ -23,42 +23,46 @@ import org.chromium.base.annotations.NativeMethods;
 @TargetApi(28)
 public class AwPacProcessor {
     private long mNativePacProcessor;
-    private long mNetworkHandle;
+    private Network mNetwork;
 
     public static final long NETWORK_UNSPECIFIED = 0;
 
     private static class LazyHolder {
-        static final AwPacProcessor sInstance = new AwPacProcessor(NETWORK_UNSPECIFIED);
+        static final AwPacProcessor sInstance = new AwPacProcessor(null);
     }
 
     public static AwPacProcessor getInstance() {
         return LazyHolder.sInstance;
     }
 
-    public AwPacProcessor(long networkHandle) {
-        mNetworkHandle = networkHandle;
-        mNativePacProcessor = AwPacProcessorJni.get().createNativePacProcessor(networkHandle);
-
-        if (mNetworkHandle != NETWORK_UNSPECIFIED) {
-            Context context = ContextUtils.getApplicationContext();
-            ConnectivityManager connectivityManager =
-                    (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            NetworkRequest.Builder builder = new NetworkRequest.Builder();
-
-            connectivityManager.registerNetworkCallback(
-                    builder.build(), new ConnectivityManager.NetworkCallback() {
-                        @Override
-                        public void onLinkPropertiesChanged(
-                                Network network, LinkProperties linkProperties) {
-                            if (network.getNetworkHandle() == mNetworkHandle) {
-                                updateNetworkLinkAddress(linkProperties);
-                            }
+    public AwPacProcessor(Network network) {
+        if (network == null) {
+            mNativePacProcessor =
+                    AwPacProcessorJni.get().createNativePacProcessor(NETWORK_UNSPECIFIED);
+            return;
+        }
+
+        mNetwork = network;
+        mNativePacProcessor =
+                AwPacProcessorJni.get().createNativePacProcessor(mNetwork.getNetworkHandle());
+
+        Context context = ContextUtils.getApplicationContext();
+        ConnectivityManager connectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkRequest.Builder builder = new NetworkRequest.Builder();
+
+        connectivityManager.registerNetworkCallback(
+                builder.build(), new ConnectivityManager.NetworkCallback() {
+                    @Override
+                    public void onLinkPropertiesChanged(
+                            Network network, LinkProperties linkProperties) {
+                        if (network.equals(mNetwork)) {
+                            updateNetworkLinkAddress(linkProperties);
                         }
-                    });
+                    }
+                });
 
-            updateNetworkLinkAddress(connectivityManager.getLinkProperties(
-                    Network.fromNetworkHandle(mNetworkHandle)));
-        }
+        updateNetworkLinkAddress(connectivityManager.getLinkProperties(mNetwork));
     }
 
     private void updateNetworkLinkAddress(LinkProperties linkProperties) {
@@ -82,6 +86,10 @@ public class AwPacProcessor {
         return AwPacProcessorJni.get().makeProxyRequest(mNativePacProcessor, this, url);
     }
 
+    public Network getNetwork() {
+        return mNetwork;
+    }
+
     public static void initializeEnvironment() {
         AwPacProcessorJni.get().initializeEnvironment();
     }