diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 19:35:15 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 19:35:15 +0000 |
| commit | a72a95781ed4373c75b31b4463b7030dcaddde41 (patch) | |
| tree | 197a2cc06a17c46c2e654f06f86f499ce625d37a /android_webview | |
| parent | e04488797a798ff831d7d0b01e8374d714e56794 (diff) | |
| download | chromium_src-a72a95781ed4373c75b31b4463b7030dcaddde41.zip chromium_src-a72a95781ed4373c75b31b4463b7030dcaddde41.tar.gz chromium_src-a72a95781ed4373c75b31b4463b7030dcaddde41.tar.bz2 | |
Workaround disk cache crash round 2
r176255 did not help apparently since same crash still happened on the
bot even after the clearCache call. Both failures follow this
UserAgentTest, so specutively move the clearCache there instead.
BUG=154805
Android only test changes. Ran through android bots.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11852021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 4 | ||||
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java | 4 |
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); } } |