[Android WebView] Actually disaled @DisabledTests.

@DisabledTest must be the only annotation on a test.

BUG=248249
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/16777002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205554 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 9 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 33c6cd5..dcfe4b77 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
@@ -1369,9 +1369,11 @@ public class AwSettingsTest extends AwTestBase {
     // setLoadsImagesAutomatically to false doesn't prevent images already
     // contained in the memory cache to be displayed.  The cache is shared among
     // all views, so the image can be put there by another view.
-    // Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
-    @Feature({"AndroidWebView", "Preferences"})
-    @SmallTest
+    /*
+     * Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
+     * @Feature({"AndroidWebView", "Preferences"})
+     * @SmallTest
+     */
     @DisabledTest
     public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
         ViewPair views = createViews();
@@ -1441,10 +1443,13 @@ public class AwSettingsTest extends AwTestBase {
     // The test verifies that after changing the LoadsImagesAutomatically
     // setting value from false to true previously skipped images are
     // automatically loaded.
-    // Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
-    @SmallTest
+
+    /*
+     * Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
+     * @SmallTest
+     * @Feature({"AndroidWebView", "Preferences"})
+     */
     @DisabledTest
-    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1477,10 +1482,13 @@ public class AwSettingsTest extends AwTestBase {
         assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
     }
 
-    // Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
-    @SmallTest
+
+    /*
+     * Fixme (crbug.com/248249): Needs investigation after crbug.com/224317
+     * @SmallTest
+     * @Feature({"AndroidWebView", "Preferences"})
+     */
     @DisabledTest
-    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable {
         ViewPair views = createViews();
         runPerViewSettingsTest(