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..655a8ba21fc8fbcdd874b7dc8733a068f64ec13b 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
@@ -24,8 +24,8 @@ const char* const kContentSettingNames[] = {
   "allow",
   "block",
   "ask",
-  "session_only",

[Bernhard Bauer, 2015/10/05 11:15:41]

We are probably going to have to do this the other way around: these strings are
part of the public extension API, so we can't change them. What we can change is
the strings used internally, as those are just identifiers for Web UI. So let's
update the internal strings to match this, and update the corresponding Web UI.

[Deepak, 2015/10/05 12:14:38]

I have removed this array here, and updated the strings in
content_settings_utils.cc file.

-  "detect_important_content"
+  "session",
+  "detect"
 };
 static_assert(arraysize(kContentSettingNames) <=
               CONTENT_SETTING_NUM_SETTINGS,
@@ -131,11 +131,5 @@ bool StringToContentSetting(const std::string& setting_str,
   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