Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java

Issue 2179163002: Make HostBrowserClassLoader#getClassLoaderInstance() work if Chrome gets updated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into webapk_chrome_updated Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java
diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java
index b419cf6ff3a38ebeee45baecab298eba30e0d4b5..d6417163f740e4e421a175b19919d65ab93dc0ab 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/DexLoader.java
@@ -17,6 +17,7 @@ import java.io.OutputStream;
/**
* Creates ClassLoader for .dex file in a remote Context's APK.
+ * Non static for the sake of tests.
*/
public class DexLoader {
private static final int BUFFER_SIZE = 16 * 1024;
@@ -33,7 +34,7 @@ public class DexLoader {
* {@link #load()}.
* @return The ClassLoader. Returns null on an error.
*/
- public static ClassLoader load(Context remoteContext, String dexName, String canaryClassName,
+ public ClassLoader load(Context remoteContext, String dexName, String canaryClassName,
File remoteDexFile, File localDexDir) {
File localDexFile = new File(localDexDir, dexName);
@@ -74,7 +75,7 @@ public class DexLoader {
* Deletes any files cached by {@link #load()}.
* @param localDexDir Cache directory passed to {@link #load()}.
*/
- public static void deleteCachedDexes(File localDexDir) {
+ public void deleteCachedDexes(File localDexDir) {
deleteChildren(localDexDir);
}

Powered by Google App Engine
This is Rietveld 408576698