| Index: chrome/android/javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java
|
| index df3e948ca25f8c6c7d943a36559e1b1dc2444867..a5f7349e03288fc195576d90a1bff8874a0b2ae4 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java
|
| @@ -7,7 +7,6 @@ package org.chromium.chrome.browser.permissions;
|
| import android.test.suitebuilder.annotation.MediumTest;
|
|
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| -import org.chromium.base.test.util.DisabledTest;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.RetryOnFailure;
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| @@ -153,12 +152,8 @@ public class MediaTest extends PermissionTestCaseBase {
|
| * Check the switch appears and that permission is granted with it toggled off.
|
| * @throws Exception
|
| */
|
| - /*
|
| - * @MediumTest
|
| - * @CommandLineFlags.Add({FAKE_DEVICE, "enable-features=" + MODAL_TOGGLE_FLAG})
|
| - * BUG=https://crbug.com/668700
|
| - */
|
| - @DisabledTest
|
| + @MediumTest
|
| + @CommandLineFlags.Add({FAKE_DEVICE, "enable-features=" + MODAL_TOGGLE_FLAG})
|
| @Feature({"MediaPermissions"})
|
| public void testMicrophonePersistenceOffDialog() throws Exception {
|
| testMediaPermissionsPlumbing(
|
| @@ -240,6 +235,6 @@ public class MediaTest extends PermissionTestCaseBase {
|
| @Feature({"MediaPermissions"})
|
| public void testCombinedPersistenceOffDialog() throws Exception {
|
| testMediaPermissionsPlumbing(
|
| - "Combined count:", "initiate_getCombined()", 1, false, false, true, true);
|
| + "Combined count:", "initiate_getCombined()", 1, true, true, true, true);
|
| }
|
| }
|
|
|