The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c1350bf5a9407c705530515b61ac1dfcbc0830cb

commit c1350bf5a9407c705530515b61ac1dfcbc0830cb
Author: bauerb <bauerb@chromium.org>
Date: Wed Aug 24 11:49:25 2016

Revert of Enable the optional permission prompt persistence toggle on grouped infobars (patchset #12 id:220001 of https://codereview.chromium.org/2254763002/ )

Reason for revert:
Breaks on Android testers (https://uberchromegw.corp.google.com/i/chromium.linux/builders/Android%20Tests/builds/30964)

BUG= 640580 

Original issue's description:
> Enable the optional permission prompt persistence toggle on grouped infobars
>
> This CL adds support for the feature enabling a persistence toggle on
> permission prompts to grouped permission infobars. The toggle is only
> shown if an enabling feature is active. Grouped bars are used exclusively
> for media permissions, so this change allows the toggle to be shown
> when a single and multiple media permissions are requested.
>
> New Android UI tests for responding to the permission prompts triggered
> by getUserMedia are added to verify the toggle behaviour. The persistence
> boolean in media_stream_devices_controller is renamed in preparation for
> upstreaming it into PermissionRequest.
>
> BUG= 632269 
>
> Committed: https://crrev.com/fea9c39c10d391e8b03b77b39b889c54a96a9b5c
> Cr-Commit-Position: refs/heads/master@{#413970}

TBR=dfalcantara@chromium.org,raymes@chromium.org,kcarattini@chromium.org,xhwang@chromium.org,dominickn@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 632269 

Review-Url: https://codereview.chromium.org/2277733002
Cr-Commit-Position: refs/heads/master@{#414047}

[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/android/BUILD.gn
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/android/java_sources.gni
[delete] https://crrev.com/9459688bc2e14e90d28550e7a8d32e85033de01b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/MediaPermissionsTest.java
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/media/media_stream_devices_controller.cc
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/media/media_stream_devices_controller.h
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/media/media_stream_infobar_delegate_android.cc
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/media/media_stream_infobar_delegate_android.h
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/permissions/grouped_permission_infobar_delegate.h
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
[modify] https://crrev.com/c1350bf5a9407c705530515b61ac1dfcbc0830cb/chrome/browser/ui/android/infobars/grouped_permission_infobar.h
[delete] https://crrev.com/9459688bc2e14e90d28550e7a8d32e85033de01b/content/test/data/android/media_permissions.html

Hmmm, that's rather odd that this CL caused the SiteSettingsPreferencesTests to fail as well. Everything in the CL is gated behind a feature flag that's off by default.

Also, these tests successfully passed the trybots and the Android Tests (dbg) builder: https://uberchromegw.corp.google.com/i/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/35881

bauerb: Is there something special about the Android Tests builder compared to the dbg builder? Or do you know someone I could ask?

I asked +jbudorick about this, and he's managed to identify that the tests in question pass when run on a device with an unlocked screen, but fail when the screen is unlocked. There seems to be a difference in the way that swarming vs. non-swarming bots behave wrt screen unlocking, and that might be why the tests made it through the CQ and all but the Android Tests builder.