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..e22831a435d48ba791f668da417f28e8a562cc69 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,19 +110,8 @@ 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);
-      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];
+  *setting = content_settings::ContentSettingFromString(setting_str);

[Bernhard Bauer, 2015/10/06 15:37:25]

This is still incorrect. ContentSettingFromString will DCHECK if an invalid
string is passed, while the contract of this method requires it to return false
-- which will never happen because the DCHECK will crash beforehand. See also my
other comment for what we should do.

[Deepak, 2015/10/07 04:39:43]

Done.

+  return *setting != CONTENT_SETTING_DEFAULT;
 }
 
 }  // namespace content_settings_helpers