[Android] Fix AwSettingsTest AppCache test crashes.

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.WebSettings;
 
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.chromium.android_webview.AndroidProtocolHandler;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.ImagePageGenerator;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.HistoryUtils;
 import org.chromium.net.test.util.TestWebServer;
@@ skipping 2184 matching lines @@
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences", "AppCache"})
     public void testAppCache() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
                 createAwTestContainerViewOnMainSync(false, contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final ContentSettings settings = getContentSettingsOnUiThread(awContents);
-        // Not sure why, but I'm experiencing DCHECK failures at net/disk_cache/in_flight_io.cc:98
-        // w/o this line. crbug.com/163383
-        clearCacheOnUiThread(awContents, true);
         settings.setJavaScriptEnabled(true);
         // Note that the cache isn't actually enabled until the call to setAppCachePath.
         settings.setAppCacheEnabled(true);
 
         TestWebServer webServer = null;
         try {
             webServer = new TestWebServer(false);
             ManifestTestHelper helper = new ManifestTestHelper(
                     webServer, "testAppCache.html", "appcache.manifest");
             loadUrlSync(
                     awContents,
                     contentClient.getOnPageFinishedHelper(),
                     helper.getHtmlUrl());
             helper.waitUntilHtmlIsRequested(0);
             // Unfortunately, there is no other good way of verifying that AppCache is
             // disabled, other than checking that it didn't try to fetch the manifest.
             Thread.sleep(1000);
             assertEquals(0, webServer.getRequestCount(helper.getManifestPath()));
             settings.setAppCachePath("whatever");  // Enables AppCache.
             loadUrlSync(
                     awContents,
                     contentClient.getOnPageFinishedHelper(),
                     helper.getHtmlUrl());
             helper.waitUntilManifestIsRequested(0);
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "Preferences", "AppCache"})
-     * BUG=crbug.com/163383
-     * If you run this test with a non-empty profile, it will crash,
-     * unless you delete the test's data directory.
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "Preferences", "AppCache"})
     public void testAppCacheNormal() throws Throwable {
         // We don't use the test helper here, because making sure that AppCache
         // is disabled takes a lot of time, so running through the usual drill
         // will take about 20 seconds.
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
         settings0.setJavaScriptEnabled(true);
         settings0.setAppCachePath("whatever");
         settings0.setAppCacheEnabled(true);
         ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
         settings1.setJavaScriptEnabled(true);
         // AppCachePath setting is global, no need to set it for the second view.
         settings1.setAppCacheEnabled(true);
 
-        clearCacheOnUiThread(views.getContents0(), true);
-
         TestWebServer webServer = null;
         try {
             webServer = new TestWebServer(false);
             ManifestTestHelper helper0 = new ManifestTestHelper(
                     webServer, "testAppCache_0.html", "appcache.manifest_0");
             loadUrlSync(
                     views.getContents0(),
                     views.getClient0().getOnPageFinishedHelper(),
                     helper0.getHtmlUrl());
             int manifestRequests0 = helper0.waitUntilManifestIsRequested(0);
@@ skipping 150 matching lines @@
         AndroidProtocolHandler.setResourceContextForTesting(getInstrumentation().getContext());
     }
 
     /**
      * Configure the browser to load resources from the browser application.
      */
     private void resetResourceContext() {
         AndroidProtocolHandler.setResourceContextForTesting(null);
     }
 }