[AW] check if native lib is loaded instead of initialized in nonembedded

WebViewApkApplication#initializeNative() only calls
LibarayLoader#loadNow and doesn't call LibraryLoader#initialize() so it
should check if the lib is loaded rather than checking if fully
initialized.

Bug: 1218923
Test: Manually force launch AwComponentUpdateService twice
Change-Id: I47fb78e192f19be661c23f9dd1846c846a30b4e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2957308
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Mugdha Lakhani <nator@chromium.org>
Commit-Queue: Hazem Ashmawy <hazems@chromium.org>
Cr-Commit-Position: refs/heads/master@{#893367}

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/AwComponentUpdateService.java

@@ -54,7 +54,7 @@ public class AwComponentUpdateService extends JobService {
 
         // TODO(http://crbug.com/1179297) look at doing this in a task on a background thread
         // instead of the main thread.
-        if (WebViewApkApplication.initializeNative()) {
+        if (WebViewApkApplication.ensureNativeLoaded()) {
             setUnexpectedExit(true);
             final long startTime = SystemClock.uptimeMillis();
             // TODO(crbug.com/1171817) Once we can log UMA from native, remove the count parameter.

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/LicenseContentProvider.java

@@ -48,7 +48,7 @@ public class LicenseContentProvider
     @Override
     public void writeDataToPipe(
             ParcelFileDescriptor output, Uri uri, String mimeType, Bundle opts, String filename) {
-        if (WebViewApkApplication.initializeNative()) {
+        if (WebViewApkApplication.ensureNativeLoaded()) {
             CreditUtilsJni.get().writeCreditsHtml(output.detachFd());
         } else {
             // Missing native library means we're the webview stub and licenses are stored as an

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java

@@ -143,9 +143,11 @@ public class WebViewApkApplication extends Application {
      * Performs minimal native library initialization required when running as a stand-alone APK.
      * @return True if the library was loaded, false if running as webview stub.
      */
-    static synchronized boolean initializeNative() {
+    static synchronized boolean ensureNativeLoaded() {
         try {
-            if (LibraryLoader.getInstance().isInitialized()) {
+            // TODO(https://crbug.com/1220862): Investigate calling LibraryLoader#initialize and
+            // LibraryLoader#isInitialized instead and document the findings.
+            if (LibraryLoader.getInstance().isLoaded()) {
                 return true;
             }
             // Should not call LibraryLoader.initialize() since this will reset UmaRecorder
@@ -153,14 +155,14 @@ public class WebViewApkApplication extends Application {
             LibraryLoader.getInstance().setLibraryProcessType(
                     LibraryProcessType.PROCESS_WEBVIEW_NONEMBEDDED);
             LibraryLoader.getInstance().loadNow();
+            LibraryLoader.getInstance().switchCommandLineForWebView();
+            WebViewApkApplicationJni.get().initializeGlobalsAndResources();
+            return true;
         } catch (Throwable unused) {
             // Happens for WebView Stub. Throws NoClassDefFoundError because of no
             // NativeLibraries.java being generated.
             return false;
         }
-        LibraryLoader.getInstance().switchCommandLineForWebView();
-        WebViewApkApplicationJni.get().initializeGlobalsAndResources();
-        return true;
     }
 
     @NativeMethods

base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java

@@ -498,11 +498,18 @@ public class LibraryLoader {
         }
     }
 
+    /**
+     * Checks whether the native library is fully loaded.
+     */
+    public boolean isLoaded() {
+        return mLoadState == LoadState.LOADED;
+    }
+
     /**
      * Checks whether the native library is fully loaded and initialized.
      */
     public boolean isInitialized() {
-        return mInitialized && mLoadState == LoadState.LOADED;
+        return mInitialized && isLoaded();
     }
 
     /**