Making structure for ContentSettings and its corresponding strings.

components/content_settings/core/browser/content_settings_utils.cc

Index: components/content_settings/core/browser/content_settings_utils.cc
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index 8a629b0fa5c20a53a40d759a46c1ad5a3faae9aa..80bfd07a92ef292b1cf60e99fbad7304949e263c 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -25,43 +25,38 @@ namespace {
 
 const char kPatternSeparator[] = ",";
 
+struct ContentSettingsStringMapping {
+  ContentSetting content_setting;
+  const char* content_setting_str;
+};
+const ContentSettingsStringMapping kContentSettingsStringMapping[] = {
+    {CONTENT_SETTING_DEFAULT, "default"},
+    {CONTENT_SETTING_ALLOW, "allow"},
+    {CONTENT_SETTING_BLOCK, "block"},
+    {CONTENT_SETTING_ASK, "ask"},
+    {CONTENT_SETTING_SESSION_ONLY, "session"},
+    {CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, "detect"},
+};
+static_assert(arraysize(kContentSettingsStringMapping) ==
+                  CONTENT_SETTING_NUM_SETTINGS,
+              "kContentSettingsToFromString should have "
+              "CONTENT_SETTING_NUM_SETTINGS elements");
 }  // namespace
 
 namespace content_settings {
 
 std::string ContentSettingToString(ContentSetting setting) {
-  switch (setting) {
-    case CONTENT_SETTING_ALLOW:
-      return "allow";
-    case CONTENT_SETTING_ASK:
-      return "ask";
-    case CONTENT_SETTING_BLOCK:
-      return "block";
-    case CONTENT_SETTING_SESSION_ONLY:
-      return "session";
-    case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
-      return "detect";
-    case CONTENT_SETTING_DEFAULT:
-      return "default";
-    case CONTENT_SETTING_NUM_SETTINGS:
-      NOTREACHED();
-  }
-
-  return ResourceIdentifier();
+  DCHECK_GE(setting, CONTENT_SETTING_DEFAULT);
+  DCHECK_LT(setting, CONTENT_SETTING_NUM_SETTINGS);
+  DCHECK_EQ(kContentSettingsStringMapping[setting].content_setting, setting);
+  return kContentSettingsStringMapping[setting].content_setting_str;
 }
 
 ContentSetting ContentSettingFromString(const std::string& name) {
-  if (name == "allow")
-    return CONTENT_SETTING_ALLOW;
-  if (name == "ask")
-    return CONTENT_SETTING_ASK;
-  if (name == "block")
-    return CONTENT_SETTING_BLOCK;
-  if (name == "session")
-    return CONTENT_SETTING_SESSION_ONLY;
-  if (name == "detect")
-    return CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
-
+  for (size_t i = 1; i < arraysize(kContentSettingsStringMapping); ++i) {

[Bernhard Bauer, 2015/10/05 08:15:09]

Please add a comment explaining why we start with 1 here.

[Deepak, 2015/10/05 09:51:30]

Done.

+    if (name == kContentSettingsStringMapping[i].content_setting_str)
+      return kContentSettingsStringMapping[i].content_setting;
+  }
   NOTREACHED() << name << " is not a recognized content setting.";
   return CONTENT_SETTING_DEFAULT;
 }