Index: base/android/java/src/org/chromium/base/PathUtils.java |
diff --git a/base/android/java/src/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java |
index 2c1ed0edb81f5f233312672f4c370094c3f9b740..b2c860fcf6f75f4ebb8811f7cae3125cd1a8d8dc 100644 |
--- a/base/android/java/src/org/chromium/base/PathUtils.java |
+++ b/base/android/java/src/org/chromium/base/PathUtils.java |
@@ -8,16 +8,12 @@ import android.content.Context; |
import android.content.pm.ApplicationInfo; |
import android.os.Environment; |
-import java.io.File; |
- |
/** |
* This class provides the path related methods for the native library. |
*/ |
public abstract class PathUtils { |
private static String sDataDirectorySuffix; |
- private static String sWebappDirectorySuffix; |
- private static String sWebappCacheDirectory; |
// Prevent instantiation. |
private PathUtils() {} |
@@ -33,17 +29,6 @@ public abstract class PathUtils { |
} |
/** |
- * Sets the directory info used for chrome process running in application mode. |
- * |
- * @param webappSuffix The suffix of the directory used for storing webapp-specific profile |
- * @param cacheDir Cache directory name for web apps. |
- */ |
- public static void setWebappDirectoryInfo(String webappSuffix, String cacheDir) { |
- sWebappDirectorySuffix = webappSuffix; |
- sWebappCacheDirectory = cacheDir; |
- } |
- |
- /** |
* @return the private directory that is used to store application data. |
*/ |
@CalledByNative |
@@ -70,15 +55,7 @@ public abstract class PathUtils { |
@SuppressWarnings("unused") |
@CalledByNative |
public static String getCacheDirectory(Context appContext) { |
- if (ContextTypes.getInstance().getType(appContext) == ContextTypes.CONTEXT_TYPE_NORMAL) { |
- return appContext.getCacheDir().getPath(); |
- } |
- if (sWebappDirectorySuffix == null || sWebappCacheDirectory == null) { |
- throw new IllegalStateException( |
- "setWebappDirectoryInfo must be called before getCacheDirectory"); |
- } |
- return new File(appContext.getDir(sWebappDirectorySuffix, appContext.MODE_PRIVATE), |
- sWebappCacheDirectory).getPath(); |
+ return appContext.getCacheDir().getPath(); |
} |
/** |