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

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java

Issue 11411229: [Android] Implement WebSettings.setAppCache{Enabled|Path} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed Created 8 years 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: android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
index 421f5da6f731038c6ff0852b5a6844cdd754b764..293d86eac8d5ccc165d7f113f1eea3b80988b231 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
@@ -13,24 +13,23 @@ public class CommonResources {
// Content-type headers used for HTML code.
public static List<Pair<String, String>> getTextHtmlHeaders(boolean disableCache) {
- List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
- headers.add(Pair.create("Content-Type", "text/html"));
- if (disableCache) headers.add(Pair.create("Cache-Control", "no-store"));
- return headers;
+ return getContentTypeAndCacheHeaders("text/html", disableCache);
}
// Content-type headers used for javascript code.
public static List<Pair<String, String>> getTextJavascriptHeaders(boolean disableCache) {
- List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
- headers.add(Pair.create("Content-Type", "text/javascript"));
- if (disableCache) headers.add(Pair.create("Cache-Control", "no-store"));
- return headers;
+ return getContentTypeAndCacheHeaders("text/javascript", disableCache);
}
// Content-type headers used for png images.
public static List<Pair<String, String>> getImagePngHeaders(boolean disableCache) {
+ return getContentTypeAndCacheHeaders("image/png", disableCache);
+ }
+
+ public static List<Pair<String, String>> getContentTypeAndCacheHeaders(
+ String contentType, boolean disableCache) {
List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
- headers.add(Pair.create("Content-Type", "image/png"));
+ headers.add(Pair.create("Content-Type", contentType));
if (disableCache) headers.add(Pair.create("Cache-Control", "no-store"));
return headers;
}

Powered by Google App Engine
This is Rietveld 408576698