summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java2
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java4
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java
index a2dbc05..ae8173c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java
@@ -12,7 +12,6 @@ import android.provider.MediaStore;
import android.test.suitebuilder.annotation.MediumTest;
import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.UrlUtils;
import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -103,7 +102,6 @@ public class SelectFileDialogTest extends ChromeActivityTestCaseBase<ChromeActiv
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
@MediumTest
@Feature({"TextInput", "Main"})
- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/592627")
public void testSelectFileAndCancelRequest() throws Throwable {
DOMUtils.clickNode(this, mContentViewCore, "input_file");
CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
index 553b2b4..c7651a6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
@@ -14,7 +14,6 @@ import android.view.ContextMenu;
import android.view.KeyEvent;
import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeSwitches;
@@ -213,7 +212,6 @@ public class ContextMenuTest extends DownloadTestBase {
@LargeTest
@Feature({"Browser"})
- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/592594")
public void testSaveDataUrl()
throws InterruptedException, TimeoutException, SecurityException, IOException {
saveMediaFromContextMenu("dataUrlIcon", R.id.contextmenu_save_image, "download.gif");
@@ -221,7 +219,6 @@ public class ContextMenuTest extends DownloadTestBase {
@LargeTest
@Feature({"Browser"})
- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/592594")
public void testSaveImage()
throws InterruptedException, TimeoutException, SecurityException, IOException {
saveMediaFromContextMenu("testImage", R.id.contextmenu_save_image, "test_image.png");
@@ -229,7 +226,6 @@ public class ContextMenuTest extends DownloadTestBase {
@LargeTest
@Feature({"Browser"})
- @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/592594")
public void testSaveVideo()
throws InterruptedException, TimeoutException, SecurityException, IOException {
// Click the video to enable playback