Flip UseGroupedPermissionInfobars and UsePermissionManagerForMediaRequests

chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java
index fe0168b218d375b0c36744f4e4f11f5f4ce08712..232fc4936e0afc7a74c9b47c3e8c905b27d9f693 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java
@@ -14,7 +14,6 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 /**
@@ -42,14 +41,6 @@ public class PermissionNavigationTest extends PermissionTestCaseBase {
         CriteriaHelper.pollUiThread(criteriaShown);
         Assert.assertEquals(0, PermissionDialogController.getInstance().getQueueLengthForTesting());
 
-        runJavaScriptCodeInCurrentTab("requestNotificationPermission()");
-        CriteriaHelper.pollInstrumentationThread(new Criteria("Request not queued") {
-            @Override
-            public boolean isSatisfied() {
-                return PermissionDialogController.getInstance().getQueueLengthForTesting() == 1;
-            }
-        });

[raymes, 2017/06/20 04:13:46]

Let's just delete this in a separate CL along with the getQueueLengthForTesting
function.

-
         runJavaScriptCodeInCurrentTab("navigate()");
 
         Tab tab = getActivity().getActivityTab();