Revert of [Chrome Settings UI] If User Exceptions are not allowed, prevent editing / viewing.

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 7cb004959a79f636f94b260eee56cdd4526cc53d..04bc2a1086f2bc0ac94ba7b8dc45514c25d7d297 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -878,16 +878,6 @@
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.setContentFilterSettingsValue", filter_settings);
-
-  // We assume that special cases covered above to get |provider_id| are not
-  // needed in AreUserExceptionsAllowedForType().
-  bool maybe_enable_exceptions =
-      GetContentSettingsMap()->AreUserExceptionsAllowedForType(type);
-
-  web_ui()->CallJavascriptFunction(
-      "ContentSettings.setUserExceptionsAllowed",
-      base::StringValue(ContentSettingsTypeToGroupName(type)),
-      base::FundamentalValue(maybe_enable_exceptions));
 }
 
 void ContentSettingsHandler::UpdateMediaSettingsFromPrefs(
@@ -973,7 +963,8 @@
     // Don't add default settings.
     if (i->primary_pattern == ContentSettingsPattern::Wildcard() &&
         i->secondary_pattern == ContentSettingsPattern::Wildcard() &&
-        i->source != site_settings::kPreferencesSource) {
+        i
+          ->source != site_settings::kPreferencesSource) {
       continue;
     }
     all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
@@ -1484,12 +1475,6 @@
   std::string type_string;
   CHECK(args->GetString(0, &type_string));
 
-  ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string);
-
-  // If user exceptions are disabled for |type|, don't remove.
-  if (!GetContentSettingsMap()->AreUserExceptionsAllowedForType(type))
-    return;
-
   // Zoom levels are no actual content type so we need to handle them
   // separately. They would not be recognized by
   // ContentSettingsTypeFromGroupName.
@@ -1505,6 +1490,7 @@
     return;
   }
 
+  ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string);
   RemoveExceptionFromHostContentSettingsMap(args, type);
 
   WebSiteSettingsUmaUtil::LogPermissionChange(
@@ -1528,10 +1514,6 @@
       type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
     NOTREACHED();
   } else {
-    // If user exceptions are disabled for |type|, don't set.
-    if (!GetContentSettingsMap()->AreUserExceptionsAllowedForType(type))
-      return;
-
     HostContentSettingsMap* settings_map =
         mode == "normal" ? GetContentSettingsMap() :
                            GetOTRContentSettingsMap();