FindBugs: Fix a synchronized method warning in HttpAuthDatabase.java.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248914 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/java/src/org/chromium/android_webview/HttpAuthDatabase.java

@@ -52,6 +52,8 @@ public class HttpAuthDatabase {
      */
     private boolean mInitialized = false;
 
+    private final Object mInitializedLock = new Object();
+
     /**
      * Create an instance of HttpAuthDatabase for the named file, and kick-off background
      * initialization of that database.
@@ -74,16 +76,18 @@ public class HttpAuthDatabase {
      * @param context the Context to use for opening the database
      * @param databaseFile Name of the file to be initialized.
      */
-    private synchronized void initOnBackgroundThread(Context context, String databaseFile) {
-        if (mInitialized) {
-            return;
-        }
+    private void initOnBackgroundThread(Context context, String databaseFile) {
+        synchronized (mInitializedLock) {
+            if (mInitialized) {
+                return;
+            }
 
-        initDatabase(context, databaseFile);
+            initDatabase(context, databaseFile);
 
-        // Thread done, notify.
-        mInitialized = true;
-        notifyAll();
+            // Thread done, notify.
+            mInitialized = true;
+            mInitializedLock.notifyAll();
+        }
     }
 
     /**
@@ -138,10 +142,10 @@ public class HttpAuthDatabase {
      * @return true if the database was initialized, false otherwise
      */
     private boolean waitForInit() {
-        synchronized (this) {
+        synchronized (mInitializedLock) {
             while (!mInitialized) {
                 try {
-                    wait();
+                    mInitializedLock.wait();
                 } catch (InterruptedException e) {
                     Log.e(LOGTAG, "Caught exception while checking initialization", e);
                 }

build/android/findbugs_filter/findbugs_known_bugs.txt

@@ -2,7 +2,6 @@ H C EC: Using pointer equality to compare a JavaBridgeCoercionTest$CustomType wi
 H P Bx: Boxing/unboxing to parse a primitive org.chromium.content.browser.ViewportTest.evaluateIntegerValue(String)  At ViewportTest.java
 M B Nm: The method name org.chromium.base.test.util.ScalableTimeout.ScaleTimeout(long) doesn't start with a lower case letter  At ScalableTimeout.java
 M B RV: Exceptional return value of java.io.File.delete() ignored in org.chromium.base.test.util.TestFileUtil.deleteFile(String)  At TestFileUtil.java
-M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At HttpAuthDatabase.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At JavaBridgeArrayCoercionTest.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At JavaBridgeArrayTest.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At JavaBridgeBasicsTest.java
@@ -15,7 +14,6 @@ M C CSM: Shouldn't use synchronized method, please narrow down the synchronizati
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At SimpleSynchronizedMethod.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At SimpleSynchronizedStaticMethod.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At TraceEvent.java
-M C CST: Shouldn't use synchronized(this), please narrow down the synchronization scope.  At HttpAuthDatabase.java
 M C CST: Shouldn't use synchronized(this), please narrow down the synchronization scope.  At SimpleSynchronizedThis.java
 M D DMI: Hard coded reference to an absolute pathname in org.chromium.android_webview.test.ArchiveTest.testAutoBadPath()  At ArchiveTest.java
 M D DMI: Hard coded reference to an absolute pathname in org.chromium.android_webview.test.ArchiveTest.testExplicitBadPath()  At ArchiveTest.java