2 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 33bb757..bbf1ad4 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -2019,10 +2019,6 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
         // will take about 20 seconds.
         ViewPair views = createViews();
 
-        // TODO(boliu): This is to work around disk cache corruption bug on
-        // unclean shutdown (crbug.com/154805).
-        clearCacheOnUiThread(views.getContents0(), true);
-
         ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
         settings0.setJavaScriptEnabled(true);
         settings0.setAppCachePath("whatever");
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
index 46349e0..55337e9 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
@@ -43,5 +43,9 @@ public class UserAgentTest extends AndroidWebViewTestBase {
         final String ua = getTitleOnUiThread(mAwContents);
         Matcher matcher = Pattern.compile("Android_[^;]+;_[^_]").matcher(ua);
         assertTrue(matcher.find());
+
+        // TODO(boliu): This is to work around disk cache corruption bug on
+        // unclean shutdown (crbug.com/154805).
+        clearCacheOnUiThread(mAwContents, true);
     }
 }