Android: Direct deps for //net

Removed //net* from the allowlist and added missing deps. Replaced javax
annotations with androidx annotations to avoid adding unnecessary deps
on //third_party/android_deps:com_google_code_findbugs_jsr305_java.

Bug: 1082904
Change-Id: Ib41144c3eff11f5b6321db0b7cd7bdea96ac40f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302491
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: Matt Mueller <mattm@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789147}

build/config/android/internal_rules.gni

@@ -3043,7 +3043,6 @@ if (enable_java_templates) {
                 "//components*",
                 "//content*",
                 "//mojo*",
-                "//net*",
                 "//remoting*",
                 "//services*",
                 "//testing*",

net/android/BUILD.gn

@@ -189,6 +189,7 @@ android_library("net_javatests") {
     ":net_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java

@@ -12,6 +12,8 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
 
+import androidx.annotation.GuardedBy;
+
 import org.junit.Assert;
 
 import org.chromium.base.Log;
@@ -21,8 +23,6 @@ import org.chromium.net.test.util.CertTestUtil;
 
 import java.io.File;
 
-import javax.annotation.concurrent.GuardedBy;
-
 /**
  * A simple file server for java tests.
  *

net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerRule.java

@@ -7,11 +7,11 @@ package org.chromium.net.test;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 
+import androidx.annotation.GuardedBy;
+
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import javax.annotation.concurrent.GuardedBy;
-
 /**
  * Junit4 rule for starting embedded test server when necessary (i.e. when accessed via
  * {@link #getServer()}), and shutting it down when the test finishes.

net/test/android/javatests/src/org/chromium/net/test/util/WebServer.java

@@ -6,6 +6,8 @@ package org.chromium.net.test.util;
 
 import android.util.Base64;
 
+import androidx.annotation.GuardedBy;
+
 import org.chromium.base.Log;
 
 import java.io.ByteArrayInputStream;
@@ -25,7 +27,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;