Make HostBrowserClassLoader#getClassLoaderInstance() work if Chrome gets updated

chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java

Index: chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
diff --git a/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java b/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
index a002a794c4696b6b739cc68e2a034825ca8d8c4f..29c284cb04689e210fd0cf4e23bcda3111175a8e 100644
--- a/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
+++ b/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
@@ -57,6 +57,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
 
     private Context mContext;
     private Context mRemoteContext;
+    private DexLoader mDexLoader;
     private File mLocalDexDir;
     private IDexOptimizerService mDexOptimizerService;
     private ServiceConnection mServiceConnection;
@@ -94,6 +95,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
     protected void setUp() {
         mContext = getInstrumentation().getTargetContext();
         mRemoteContext = getRemoteContext(mContext);
+        mDexLoader = new DexLoader();
 
         mLocalDexDir = mContext.getDir("dex", Context.MODE_PRIVATE);
         if (mLocalDexDir.exists()) {
@@ -145,7 +147,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
         File remoteDexFile = new File(remoteDexFilePath);
         assertFalse(isDexOptNeeded(remoteDexFile));
 
-        ClassLoader loader = DexLoader.load(
+        ClassLoader loader = mDexLoader.load(
                 mRemoteContext, DEX_ASSET_NAME, CANARY_CLASS_NAME, remoteDexFile, mLocalDexDir);
         assertNotNull(loader);
         assertTrue(canLoadCanaryClass(loader));
@@ -161,7 +163,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
      */
     @MediumTest
     public void testLoadFromLocalDataDir() {
-        ClassLoader loader = DexLoader.load(
+        ClassLoader loader = mDexLoader.load(
                 mRemoteContext, DEX_ASSET_NAME, CANARY_CLASS_NAME, null, mLocalDexDir);
         assertNotNull(loader);
         assertTrue(canLoadCanaryClass(loader));
@@ -192,7 +194,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
             // generate the optimized dex file.
             FileMonitor localDexDirMonitor = new FileMonitor(mLocalDexDir);
             localDexDirMonitor.startWatching();
-            ClassLoader loader = DexLoader.load(
+            ClassLoader loader = mDexLoader.load(
                     mRemoteContext, DEX_ASSET_NAME, CANARY_CLASS_NAME, null, mLocalDexDir);
             localDexDirMonitor.stopWatching();
 
@@ -206,7 +208,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
             // Load dex a second time. We should use the already extracted dex file.
             FileMonitor localDexDirMonitor = new FileMonitor(mLocalDexDir);
             localDexDirMonitor.startWatching();
-            ClassLoader loader = DexLoader.load(
+            ClassLoader loader = mDexLoader.load(
                     mRemoteContext, DEX_ASSET_NAME, CANARY_CLASS_NAME, null, mLocalDexDir);
             localDexDirMonitor.stopWatching();
 
@@ -228,7 +230,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
         assertTrue(mLocalDexDir.mkdir());
 
         // Load canary.dex
-        ClassLoader loader1 = DexLoader.load(
+        ClassLoader loader1 = mDexLoader.load(
                 mRemoteContext, DEX_ASSET_NAME, CANARY_CLASS_NAME, null, mLocalDexDir);
         assertNotNull(loader1);
         assertTrue(canLoadCanaryClass(loader1));
@@ -236,9 +238,9 @@ public class DexLoaderTest extends InstrumentationTestCase {
         File canaryDexFile1 = new File(mLocalDexDir, DEX_ASSET_NAME);
         assertTrue(canaryDexFile1.exists());
 
-        DexLoader.deleteCachedDexes(mLocalDexDir);
+        mDexLoader.deleteCachedDexes(mLocalDexDir);
 
-        ClassLoader loader2 = DexLoader.load(
+        ClassLoader loader2 = mDexLoader.load(
                 mRemoteContext, DEX_ASSET_NAME2, CANARY_CLASS_NAME2, null, mLocalDexDir);
         assertNotNull(loader2);
         assertTrue(canLoadClass(loader2, CANARY_CLASS_NAME2));