Avoid having to mock LibraryLoader in Native Java Unittests

This change makes it so we don't have to mock the LibraryLoader in all
Native Java Unittests that use GURL (which talks to the LibraryLoader
to see if the libraries have been loaded).

Bug: 783819
Change-Id: I56c60a0043c9547a98674fdb74096517bca8f355
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2025974
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736534}

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

@@ -793,6 +793,16 @@ public class LibraryLoader {
                 ContextCompat.getCodeCacheDir(ContextUtils.getApplicationContext()), LIBRARY_DIR);
     }
 
+    /**
+     * This sets the LibraryLoader internal state to its fully initialized state and should *only*
+     * be used by clients like NativeTests which manually load their native libraries without using
+     * the LibraryLoader.
+     */
+    public void setLibrariesLoadedForNativeTests() {
+        mLoadState = LoadState.LOADED;
+        mInitialized = true;
+    }
+
     @NativeMethods
     interface Natives {
         // Only methods needed before or during normal JNI registration are during System.OnLoad.

testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTest.java

@@ -50,5 +50,6 @@ public class NativeUnitTest extends NativeTest {
             System.loadLibrary(library);
             Log.i(TAG, "loaded: %s", library);
         }
+        LibraryLoader.getInstance().setLibrariesLoadedForNativeTests();
     }
 }

url/android/gurl_android_unittest.cc

@@ -20,10 +20,6 @@ class GURLAndroidTest : public ::testing::Test {
   GURLAndroidTest()
       : j_test_(Java_GURLJavaTest_Constructor(AttachCurrentThread())) {}
 
-  void SetUp() override {
-    Java_GURLJavaTest_setUp(AttachCurrentThread(), j_test_);
-  }
-
   const base::android::ScopedJavaGlobalRef<jobject>& j_test() {
     return j_test_;
   }

url/android/native_java_unittests/src/org/chromium/url/GURLJavaTest.java

@@ -5,12 +5,9 @@
 package org.chromium.url;
 
 import org.junit.Assert;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeJavaTest;
-import org.chromium.base.library_loader.LibraryLoader;
 
 import java.net.URISyntaxException;
 
@@ -20,18 +17,9 @@ import java.net.URISyntaxException;
  * correctly.
  */
 public class GURLJavaTest {
-    @Mock
-    private LibraryLoader mLibraryLoader;
-
     @CalledByNative
     private GURLJavaTest() {}
 
-    @CalledByNative
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        LibraryLoader.setLibraryLoaderForTesting(mLibraryLoader);
-    }
-
     @CalledByNative
     public GURL createGURL(String uri) {
         return new GURL(uri);