Views/Permissions: Update desktop UI to display BLOCK for embargoed permissions.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index a8549dddb7e8f68511f29b23c857127dbecb6272..22355f48a4147c9b0078da9d8d72c39b47e6475d 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -32,6 +32,8 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/chooser_context_base.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -674,6 +676,24 @@ void WebsiteSettings::PresentSitePermissions() {
                                                       NULL);
     }
 
+    // For permissions that are still prompting the user and haven't been
+    // explicitly set by another source, check its embargo status.
+    if (PermissionUtil::IsPermission(permission_info.type) &&
+        permission_info.setting == CONTENT_SETTING_DEFAULT &&
+        permission_info.source ==
+            content_settings::SettingSource::SETTING_SOURCE_USER) {
+      // TODO(raymes): Use GetPermissionStatus() to retrieve information
+      // about *all* permissions once it has default behaviour implemented for
+      // ContentSettingTypes that aren't permissions.
+      PermissionResult permission_result =
+          PermissionManager::Get(profile_)->GetPermissionStatus(
+              permission_info.type, site_url_, site_url_);
+
+      // If under embargo, update |permission_info| to reflect that.
+      if (permission_result.content_setting == CONTENT_SETTING_BLOCK)

[raymes, 2017/03/06 23:06:52]

I think there are some reasons for correctness to check the source here as we
can't always assume that the result will be due to embargo. I also think it
makes the code clearer - it certainly makes it match up with the comment above.
I chatted with Dom and he was ok leaving it in.

[Patti Lor, 2017/03/07 06:31:28]

Done.

+        permission_info.setting = permission_result.content_setting;
+    }
+
     permission_info_list.push_back(permission_info);
   }