Making structure for ContentSettings and its corresponding strings.

components/content_settings/core/browser/content_settings_utils_unittest.cc

Index: components/content_settings/core/browser/content_settings_utils_unittest.cc
diff --git a/components/content_settings/core/browser/content_settings_utils_unittest.cc b/components/content_settings/core/browser/content_settings_utils_unittest.cc
index f89b45b42f9f4ad3eda913c973a263da655d0eca..c493b24ff3aa97c7e8dd40ff18bb65cefc1e9706 100644
--- a/components/content_settings/core/browser/content_settings_utils_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_utils_unittest.cc
@@ -9,6 +9,21 @@
 #include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
+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");
+
+}  // namespace
+
 TEST(ContentSettingsUtilsTest, ParsePatternString) {
   content_settings::PatternPair pattern_pair;
 
@@ -44,3 +59,25 @@ TEST(ContentSettingsUtilsTest, ParsePatternString) {
   EXPECT_FALSE(pattern_pair.first.IsValid());
   EXPECT_FALSE(pattern_pair.second.IsValid());
 }
+
+TEST(ContentSettingsUtilsTest, ContentSettingsStringMap) {
+  std::string setting_string =
+      content_settings::ContentSettingToString(CONTENT_SETTING_NUM_SETTINGS);
+  EXPECT_TRUE(setting_string.empty());
+
+  for (size_t type = 0; type < arraysize(kContentSettingNames); ++type) {

[Bernhard Bauer, 2015/10/08 09:32:46]

Nit: |type| isn't actually the correct name for this, as we are iterating over
settings. We could just call it |i| and leave |setting| for the ContentSetting
variable below.

[Deepak, 2015/10/08 10:48:15]

Done.

+    ContentSetting setting = static_cast<ContentSetting>(type);
+    setting_string = content_settings::ContentSettingToString(setting);
+    EXPECT_EQ(kContentSettingNames[type], setting_string);
+
+    ContentSetting setting_type;

[Bernhard Bauer, 2015/10/08 09:32:46]

Similarly, |_type| is incorrect here. |converted_setting| maybe?

[Deepak, 2015/10/08 10:48:15]

Done.

+    if (type == 0) {
+      EXPECT_FALSE(content_settings::ContentSettingFromString(
+          kContentSettingNames[type], &setting_type));
+    } else {
+      EXPECT_TRUE(content_settings::ContentSettingFromString(
+          kContentSettingNames[type], &setting_type));
+    }
+    EXPECT_EQ(setting, setting_type);
+  }
+}