[Android Build] Enable PrimitiveAtomicReference errorprone check

BUG=1029038

Change-Id: I81ccafffacc1188e485d9950ee84141143e7a8d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527627Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826350}

build/android/gyp/compile_java.py

@@ -62,8 +62,6 @@ ERRORPRONE_WARNINGS_TO_DISABLE = [
     'JUnitAmbiguousTestClass',
     # TODO(crbug.com/1027683): Follow steps in bug.
     'UnnecessaryParentheses',
-    # TODO(wnwen): Fix issue in JavaUploadDataSinkBase.java
-    'PrimitiveAtomicReference',
     # Android platform default is always UTF-8.
     # https://developer.android.com/reference/java/nio/charset/Charset.html#defaultCharset()
     'DefaultCharset',

components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java

@@ -16,7 +16,8 @@ import java.nio.ByteBuffer;
 import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Base class for Java UrlRequest implementations of UploadDataSink. Handles asynchronicity and
  * manages the executors for this upload.
@@ -34,8 +35,7 @@ public abstract class JavaUploadDataSinkBase extends UploadDataSink {
 
     public static final int DEFAULT_UPLOAD_BUFFER_SIZE = 8192;
 
-    private final AtomicReference<Integer /*SinkState*/> mSinkState =
-            new AtomicReference<>(SinkState.NOT_STARTED);
+    private final AtomicInteger /*SinkState*/ mSinkState = new AtomicInteger(SinkState.NOT_STARTED);
     private final Executor mUserUploadExecutor;
     private final Executor mExecutor;
     private final UploadDataProvider mUploadProvider;

components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java

@@ -40,7 +40,7 @@ import java.util.TreeMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.annotation.concurrent.GuardedBy;
 
@@ -70,8 +70,7 @@ final class JavaUrlRequest extends UrlRequestBase {
      * waiting for the read to succeed), runtime error (network code or user code throws an
      * exception), or cancellation.
      */
-    private final AtomicReference<Integer /* @State */> mState =
-            new AtomicReference<>(State.NOT_STARTED);
+    private final AtomicInteger /* State */ mState = new AtomicInteger(State.NOT_STARTED);
     private final AtomicBoolean mUploadProviderClosed = new AtomicBoolean(false);
 
     private final boolean mAllowDirectExecutor;