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

commit e7fa637d7ac2f35b26ffc6c1d0b5cf443d6c787c
Author: Tommy Steimel <steimel@chromium.org>
Date: Wed Oct 18 15:34:49 2017

Add JavaScript/Sound exceptions in mergePermissionInfoForTopLevelOrigin

This CL fixes an issue where going to Site Settings from the Page Info
Bubble in Android wouldn't show JavaScript or Sound exceptions since
they weren't being added in the merge method.

Bug: 763982
Change-Id: I5ebdd66ef98ff6a5542ec3c8c6b533935673930f
Reviewed-on: https://chromium-review.googlesource.com/724208
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509775}
[modify] https://crrev.com/e7fa637d7ac2f35b26ffc6c1d0b5cf443d6c787c/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/e7fa637d7ac2f35b26ffc6c1d0b5cf443d6c787c/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

Is this FIXED?

Not fully. My CL took care of Javascript and Sound, but there are still more TODOs to go through

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

commit 4be86daec705d44e32ca9c94c958b9fa0d361854
Author: Timothy Loh <timloh@chromium.org>
Date: Thu Nov 23 02:29:09 2017

Handle autoplay/background sync in mergePermissionInfoForTopLevelOrigin

This patch fixes Site Settings on Android to properly display autoplay
and background sync permissions. This fixes a regression from an earlier
patch that made drilling down from single category permissions show all
permissions ( bug 673620 ), as drilling down from autoplay and background
sync wouldn't show the respective permissions.

Bug: 763982, 786907
Change-Id: I2d2f463c123556975cf794996eac71583ca25f82
Reviewed-on: https://chromium-review.googlesource.com/784734
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518824}
[modify] https://crrev.com/4be86daec705d44e32ca9c94c958b9fa0d361854/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/4be86daec705d44e32ca9c94c958b9fa0d361854/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

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

commit 01b4e6cb6ff0c0289f9cfd5b0850af28b45b6eb4
Author: Timothy Loh <timloh@chromium.org>
Date: Thu Dec 07 01:51:40 2017

Handle popup exceptions in mergePermissionInfoForTopLevelOrigin

This patch fixes Site Settings on Android to properly display popup
exceptions. This fixes a regression from an earlier patch that made
drilling down from single category permissions show all permissions
( bug 673620 ), which made it impossible to clear popup exceptions on
any individual site.

Bug: 791897, 763982
Change-Id: Ib1383289c8f7e0fb3643a9ad0a8ef0f7c3f3b137
Reviewed-on: https://chromium-review.googlesource.com/810224
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522300}
[modify] https://crrev.com/01b4e6cb6ff0c0289f9cfd5b0850af28b45b6eb4/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

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

commit 5a4d6841b9ae074de1e5946b82b924769609b41f
Author: Timothy Loh <timloh@chromium.org>
Date: Fri Dec 08 02:30:29 2017

Handle popup exceptions in mergePermissionInfoForTopLevelOrigin

This patch fixes Site Settings on Android to properly display popup
exceptions. This fixes a regression from an earlier patch that made
drilling down from single category permissions show all permissions
( bug 673620 ), which made it impossible to clear popup exceptions on
any individual site.

Bug: 791897, 763982
Change-Id: Ib1383289c8f7e0fb3643a9ad0a8ef0f7c3f3b137
Reviewed-on: https://chromium-review.googlesource.com/810224
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#522300}(cherry picked from commit 01b4e6cb6ff0c0289f9cfd5b0850af28b45b6eb4)
Reviewed-on: https://chromium-review.googlesource.com/816415
Reviewed-by: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/branch-heads/3282@{#89}
Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840}
[modify] https://crrev.com/5a4d6841b9ae074de1e5946b82b924769609b41f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java