chromium linker: Suppress findbugs false positive.

Remove a workround for a findbugs false positive. Replace it
with findbugs warning suppression.

Review URL: https://codereview.chromium.org/1714873002

Cr-Commit-Position: refs/heads/master@{#376475}

1 files changed, 8 insertions, 11 deletions

diff --git a/base/android/java/src/org/chromium/base/library_loader/ModernLinker.java b/base/android/java/src/org/chromium/base/library_loader/ModernLinker.java
index 5abc4e5..bff22c8 100644
--- a/base/android/java/src/org/chromium/base/library_loader/ModernLinker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/ModernLinker.java
@@ -9,6 +9,7 @@ import android.os.SystemClock;
 
 import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
+import org.chromium.base.annotations.SuppressFBWarnings;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -159,6 +160,7 @@ class ModernLinker extends Linker {
 
     // Used internally to wait for shared RELROs. Returns once useSharedRelros() has been
     // called to supply a valid shared RELROs bundle.
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE")
     private void waitForSharedRelrosLocked() {
         if (DEBUG) {
             Log.i(TAG, "waitForSharedRelros called");
@@ -172,17 +174,12 @@ class ModernLinker extends Linker {
 
         // Wait until notified by useSharedRelros() that shared RELROs have arrived.
         long startTime = DEBUG ? SystemClock.uptimeMillis() : 0;
-        // Note: The additional synchronized block is present only to silence Findbugs.
-        // Without it, Findbugs reports a false positive:
-        // RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE: Redundant nullcheck of value known to be null
-        synchronized (mLock) {
-            while (mSharedRelros == null) {
-                try {
-                    mLock.wait();
-                } catch (InterruptedException e) {
-                    // Restore the thread's interrupt status.
-                    Thread.currentThread().interrupt();
-                }
+        while (mSharedRelros == null) {
+            try {
+                mLock.wait();
+            } catch (InterruptedException e) {
+                // Restore the thread's interrupt status.
+                Thread.currentThread().interrupt();
             }
         }