Mocks:
https://folio.googleplex.com/chrome-ux/mocks/286-media-playback/042516_AutoPlaySettings#%2F01_TapMedia.png

Assets (search for "media" and "autoplay")
https://drive.google.com/a/google.com/folderview?id=0B6x6iYCtKinEMnNGUmxyal9FcW8&usp=sharing

Changes:
A) Combine protected media and autoplay into a single "Media" section
B) Add a media and autoplay icon

Related settings polish fixes that would be GREAT to have (and that may come up in UI Review so if you don't mind it really would be awesome.) Bugs aren't logged for all of them but I could do that if you rather separate them out.

1) Update protected media image (search for "protected_media" in the above assets link) as it's been smallish for awhile and sgabriel@ isn't the VisD for Chrome anymore so I'm going rogue!
2) Make the allow/blocked/exceptions list titles blue instead of black (this came up as not matching the rest of settings titles.)
3) Change exceptions language per this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=601918
4) Change allow/block subtext per this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=467788#c11
5) Look into alignment for the icons + text to the <- icon and title at the top. Would be great if everything matched the title. (So icons move right a bit and text moves left a bit.)

Update:

I used the new image for 1) and it still looks small. Not sure why that is. :/

Ugh. So weird. It's like it doesn't WANT to be larger! Thanks for trying at least.

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

commit f7e0f4ed07692435b0235354a83ba4466988789b
Author: finnur <finnur@chromium.org>
Date: Tue May 03 12:32:01 2016

Site Settings: Add Autoplay as a permission.

BUG= 604753 

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

[add] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/drawable-hdpi/settings_autoplay.png
[add] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/drawable-mdpi/settings_autoplay.png
[add] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/drawable-xhdpi/settings_autoplay.png
[add] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/drawable-xxhdpi/settings_autoplay.png
[add] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/drawable-xxxhdpi/settings_autoplay.png
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/xml/single_website_preferences.xml
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
[modify] https://crrev.com/f7e0f4ed07692435b0235354a83ba4466988789b/chrome/browser/android/preferences/pref_service_bridge.cc

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

commit 2d4101ec17e44ff061d5e65bc52f386d9985e881
Author: finnur <finnur@chromium.org>
Date: Mon May 09 18:04:36 2016

Site Settings Android: A few polish items.

From  issue 601918 :
- Change "+ Add site" blue action link to be "+ Add site exception"
- Change dialog text to be: "Allow [JavaScript/the permission in question etc.] for a specific site."

From  issue 467788 :
- Update the individual site settings page toggles with verbs that match the permissions bubbles

From  issue 604753  (partial fix):
- Improve alignment of Site Settings list a bit (move icon a bit to the right).
- Color the Site List heading blue.

Also add an updated image for Protected Content (slightly larger) and the Media icon, which is for
the container menu that will house Protected Content and Autoplay.

BUG= 601918 ,  467788 ,  604753 

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

[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-hdpi/permission_protected_media.png
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-hdpi/settings_media.png
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-mdpi/permission_protected_media.png
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-mdpi/settings_media.png
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xhdpi/permission_protected_media.png
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xhdpi/settings_media.png
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xxhdpi/permission_protected_media.png
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xxhdpi/settings_media.png
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xxxhdpi/permission_protected_media.png
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/drawable-xxxhdpi/settings_media.png
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/values/dimens.xml
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[add] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreference.java
[modify] https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881/chrome/android/java/strings/android_chrome_strings.grd

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

commit 04e90ff9a7f58302c97fe4a0c14dd12e41f89951
Author: finnur <finnur@chromium.org>
Date: Tue May 10 15:25:58 2016

Revert of Site Settings Android: A few polish items. (patchset #6 id:180001 of https://codereview.chromium.org/1947493002/ )

Reason for revert:
Caused crbug.com/610576

Original issue's description:
> Site Settings Android: A few polish items.
>
> From  issue 601918 :
> - Change "+ Add site" blue action link to be "+ Add site exception"
> - Change dialog text to be: "Allow [JavaScript/the permission in question etc.] for a specific site."
>
> From  issue 467788 :
> - Update the individual site settings page toggles with verbs that match the permissions bubbles
>
> From  issue 604753  (partial fix):
> - Improve alignment of Site Settings list a bit (move icon a bit to the right).
> - Color the Site List heading blue.
>
> Also add an updated image for Protected Content (slightly larger) and the Media icon, which is for
> the container menu that will house Protected Content and Autoplay.
>
> BUG= 601918 ,  467788 ,  604753 
>
> Committed: https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881
> Cr-Commit-Position: refs/heads/master@{#392363}

TBR=twellington@chromium.org,dfalcantara@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 601918 ,  467788 ,  604753 

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

[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/drawable-hdpi/permission_protected_media.png
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/res/drawable-hdpi/settings_media.png
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/drawable-mdpi/permission_protected_media.png
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/res/drawable-mdpi/settings_media.png
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/drawable-xhdpi/permission_protected_media.png
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/res/drawable-xhdpi/settings_media.png
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/drawable-xxhdpi/permission_protected_media.png
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/res/drawable-xxhdpi/settings_media.png
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/drawable-xxxhdpi/permission_protected_media.png
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/res/drawable-xxxhdpi/settings_media.png
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/values/dimens.xml
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[delete] https://crrev.com/c3be22bfd9c16f9b6ca288d9737a1df5dde2ee0b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreference.java
[modify] https://crrev.com/04e90ff9a7f58302c97fe4a0c14dd12e41f89951/chrome/android/java/strings/android_chrome_strings.grd

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

commit 91faabbb0fd92d636378508b4aa644b11bc4877b
Author: finnur <finnur@chromium.org>
Date: Wed May 11 12:01:45 2016

Site Settings Android: A few polish items.

From  issue 601918 :
- Change "+ Add site" blue action link to be "+ Add site exception"
- Change dialog text to be: "Allow [JavaScript/the permission in question etc.] for a specific site."

From  issue 467788 :
- Update the individual site settings page toggles with verbs that match the permissions bubbles

From  issue 604753  (partial fix):
- Improve alignment of Site Settings list a bit (move icon a bit to the right).
- Color the Site List heading blue.

Also add an updated image for Protected Content (slightly larger) and the Media icon, which is for
the container menu that will house Protected Content and Autoplay.

BUG= 601918 ,  467788 ,  604753 

Committed: https://crrev.com/2d4101ec17e44ff061d5e65bc52f386d9985e881
Cr-Commit-Position: refs/heads/master@{#392363}

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

[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-hdpi/permission_protected_media.png
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-hdpi/settings_media.png
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-mdpi/permission_protected_media.png
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-mdpi/settings_media.png
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xhdpi/permission_protected_media.png
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xhdpi/settings_media.png
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xxhdpi/permission_protected_media.png
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xxhdpi/settings_media.png
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xxxhdpi/permission_protected_media.png
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/drawable-xxxhdpi/settings_media.png
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/values/dimens.xml
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[add] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreference.java
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/91faabbb0fd92d636378508b4aa644b11bc4877b/chrome/android/java_sources.gni

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

commit b9738b67be66a0e56e6951e97274332c0d666d28
Author: finnur <finnur@chromium.org>
Date: Thu May 12 21:46:22 2016

Site Settings Android: Move Autoplay and Protected Content to Media menu.

This moves the Autoplay and Protected Content permissions under a sub-menu
called Media. Note: If only one of the two (Autoplay or Protected Content)
is visible, the one that is visible shows up on the main Site Settings menu
instead (no point in having a sub-menu with only one item).

BUG= 604753 

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

[modify] https://crrev.com/b9738b67be66a0e56e6951e97274332c0d666d28/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/b9738b67be66a0e56e6951e97274332c0d666d28/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
[modify] https://crrev.com/b9738b67be66a0e56e6951e97274332c0d666d28/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/b9738b67be66a0e56e6951e97274332c0d666d28/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

As I understand it, this is done. Can reopen or file other issues if polish/changes are needed.