Making structure for ContentSettings and its corresponding strings.

chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
index 9606a4d2fbc9130bcffe36b5373c3d9cb92ebdf9..4208fbdd90da307966d39f678b6d6e9229d713c6 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
@@ -19,18 +19,6 @@ const char kNoPathWildcardsError[] =
 const char kNoPathsError[] = "Specific paths are not allowed.";
 const char kInvalidPatternError[] = "The pattern \"*\" is invalid.";
 
-const char* const kContentSettingNames[] = {
-  "default",
-  "allow",
-  "block",
-  "ask",
-  "session_only",
-  "detect_important_content"
-};
-static_assert(arraysize(kContentSettingNames) <=
-              CONTENT_SETTING_NUM_SETTINGS,
-              "kContentSettingNames has an unexpected number of elements");
-
 // TODO(bauerb): Move this someplace where it can be reused.
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == url::kHttpScheme)
@@ -122,20 +110,16 @@ std::string ContentSettingsTypeToString(ContentSettingsType type) {
 
 bool StringToContentSetting(const std::string& setting_str,
                             ContentSetting* setting) {
-  for (size_t type = 0; type < arraysize(kContentSettingNames); ++type) {
-    if (setting_str == kContentSettingNames[type]) {
-      *setting = static_cast<ContentSetting>(type);
+  if (setting_str.empty() || setting_str == "default")
+    return false;
+  ContentSetting content_setting =
+      content_settings::ContentSettingFromString(setting_str);
+  if (content_setting != CONTENT_SETTING_DEFAULT) {

[Bernhard Bauer, 2015/10/05 12:34:28]

Hm... this way around is a bit awkward, with the explicit comparison to DEFAULT.
Actually, ContentSettingFromString will DCHECK when given an invalid string,
while this method is supposed to return false, so this won't actually work. What
we could do is change the other method to this interface, and DCHECK the return
value at the call site.

[Deepak, 2015/10/05 14:25:32]

Done.

+    *setting = content_setting;
       return true;
-    }
   }
   return false;
 }
 
-const char* ContentSettingToString(ContentSetting setting) {
-  size_t index = static_cast<size_t>(setting);
-  DCHECK_LT(index, arraysize(kContentSettingNames));
-  return kContentSettingNames[index];
-}
-
 }  // namespace content_settings_helpers
 }  // namespace extensions