Add durable storage to content settings enum and prefs file.

Split off from https://codereview.chromium.org/1164073005/ to keep the
permission-requesting and quota logic changes clearer.

BUG=482814

Review URL: https://codereview.chromium.org/1217893006

Cr-Commit-Position: refs/heads/master@{#337331}

11 files changed, 23 insertions, 1 deletions

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index aba7d53..d9bf7b8 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -287,6 +287,7 @@ class ContentSettingBubbleWebContentsObserverBridge
     case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
     case CONTENT_SETTINGS_TYPE_APP_BANNER:
     case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT:
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       NOTREACHED();
   }
   if ((self = [super initWithWindowNibPath:nibPath
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
index f7f278b..9ca8b97 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
@@ -115,7 +115,8 @@ TEST_F(ContentSettingBubbleControllerTest, Init) {
         i == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING ||
         i == CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS ||
         i == CONTENT_SETTINGS_TYPE_APP_BANNER ||
-        i == CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT) {
+        i == CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT ||
+        i == CONTENT_SETTINGS_TYPE_DURABLE_STORAGE) {
       // These types have no bubble.
       continue;
     }
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 48aaf4c..6f6eece 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -782,6 +782,10 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel(
       // to track engagement with various origins, and is not a user visible
       // content setting.
       break;
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
+      // Durable storage is not yet user visible. TODO(dgrogan): Make it so.
+      // https://crbug.com/482814
+      break;
     default:
       UpdateExceptionsViewFromHostContentSettingsMap(type);
       break;
@@ -806,6 +810,7 @@ void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel(
     case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
     case CONTENT_SETTINGS_TYPE_APP_BANNER:
     case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT:
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       break;
     default:
       UpdateExceptionsViewFromOTRHostContentSettingsMap(type);
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index 45a9fd6..0bf7514 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -66,6 +66,7 @@ const DefaultContentSettingInfo kDefaultSettings[] = {
 #endif
   {prefs::kDefaultAppBannerSetting, CONTENT_SETTING_DEFAULT},
   {prefs::kDefaultSiteEngagementSetting, CONTENT_SETTING_DEFAULT},
+  {prefs::kDefaultDurableStorageSetting, CONTENT_SETTING_ASK},
 };
 static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
               "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES "
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc
index 7b3faee..a171f48 100644
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc
@@ -48,6 +48,7 @@ const char* kPrefToManageType[] = {
 #endif
   nullptr,  // No policy for default value of app banners
   nullptr,  // No policy for default value of site engagement
+  nullptr,  // No policy for default value of durable storage
 };
 static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,
               "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES "
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
index 118cabf..ef80480 100644
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -95,6 +95,7 @@ const char* kContentSettingsExceptionsPrefs[] = {
 #endif
     prefs::kContentSettingsAppBannerPatternPairs,
     prefs::kContentSettingsSiteEngagementPatternPairs,
+    prefs::kContentSettingsDurableStoragePatternPairs,
 };
 static_assert(arraysize(kContentSettingsExceptionsPrefs)
               == CONTENT_SETTINGS_NUM_TYPES,
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index fc4b47a..eb91f0b 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -51,6 +51,7 @@ const char* kTypeNames[] = {
 #endif
   "app-banner",
   "site-engagement",
+  "durable-storage"
 };
 static_assert(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
               "kTypeNames should have CONTENT_SETTINGS_NUM_TYPES elements");
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index 4840aa2..a9f3867 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -68,6 +68,8 @@ ContentSettingsTypeHistogram ContentSettingTypeToHistogramValue(
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER;
     case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_SITE_ENGAGEMENT;
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
+      return CONTENT_SETTINGS_TYPE_HISTOGRAM_DURABLE_STORAGE;
     case CONTENT_SETTINGS_NUM_TYPES:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID;
   }
@@ -107,6 +109,7 @@ bool IsContentSettingsTypeSyncable(ContentSettingsType content_setting) {
 #endif
     case CONTENT_SETTINGS_TYPE_APP_BANNER:
     case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT:
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       return false;
 
     case CONTENT_SETTINGS_TYPE_DEFAULT:
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 155cfd9..7fa6106 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -48,6 +48,7 @@ enum ContentSettingsType {
 #endif
   CONTENT_SETTINGS_TYPE_APP_BANNER,
   CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
+  CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
   CONTENT_SETTINGS_NUM_TYPES,
 };
 
@@ -81,6 +82,7 @@ enum ContentSettingsTypeHistogram {
   CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER,
   CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER,
   CONTENT_SETTINGS_TYPE_HISTOGRAM_SITE_ENGAGEMENT,
+  CONTENT_SETTINGS_TYPE_HISTOGRAM_DURABLE_STORAGE,
   CONTENT_SETTINGS_HISTOGRAM_NUM_TYPES,
 };
 
diff --git a/components/content_settings/core/common/pref_names.cc b/components/content_settings/core/common/pref_names.cc
index ac31d79..4e78675 100644
--- a/components/content_settings/core/common/pref_names.cc
+++ b/components/content_settings/core/common/pref_names.cc
@@ -85,6 +85,8 @@ const char kDefaultAppBannerSetting[] =
     "profile.default_content_setting_values.app_banner";
 const char kDefaultSiteEngagementSetting[] =
     "profile.default_content_setting_values.site_engagement";
+const char kDefaultDurableStorageSetting[] =
+    "profile.default_content_setting_values.durable_storage";
 
 // Boolean indicating whether the media stream default setting had been
 // migrated into two separate microphone and camera settings.
@@ -148,6 +150,8 @@ const char kContentSettingsAppBannerPatternPairs[] =
     "profile.content_settings.exceptions.app_banner";
 const char kContentSettingsSiteEngagementPatternPairs[] =
     "profile.content_settings.exceptions.site_engagement";
+const char kContentSettingsDurableStoragePatternPairs[] =
+    "profile.content_settings.exceptions.durable_storage";
 
 // Whether the patern pairs have been migrated from the deprecated aggregate
 // preference |kContentSettingsPatternPairs| to the separate preferences
diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h
index fabce57..d6a5ce6 100644
--- a/components/content_settings/core/common/pref_names.h
+++ b/components/content_settings/core/common/pref_names.h
@@ -44,6 +44,7 @@ extern const char kDefaultProtectedMediaIdentifierSetting[];
 #endif
 extern const char kDefaultAppBannerSetting[];
 extern const char kDefaultSiteEngagementSetting[];
+extern const char kDefaultDurableStorageSetting[];
 
 extern const char kMigratedDefaultMediaStreamSetting[];
 
@@ -75,6 +76,7 @@ extern const char kContentSettingsProtectedMediaIdentifierPatternPairs[];
 #endif
 extern const char kContentSettingsAppBannerPatternPairs[];
 extern const char kContentSettingsSiteEngagementPatternPairs[];
+extern const char kContentSettingsDurableStoragePatternPairs[];
 
 extern const char kMigratedContentSettingsPatternPairs[];