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..e6c73107971ad3a4baf82b51c869b63254c791da 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,19 @@
 #include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {

[Bernhard Bauer, 2015/10/07 09:32:04]

Empty lines after opening a namespace and before closing it.

[Deepak, 2015/10/07 11:12:24]

Done.

+const char* const kContentSettingNames[] = {
+  "default",
+  "allow",
+  "block",
+  "ask",
+  "session_only",
+  "detect_important_content"

[Bernhard Bauer, 2015/10/07 09:32:04]

Nit: Add a comma at the end here; it will reduce the number of modified lines if
we should add another setting.

[Deepak, 2015/10/07 11:12:24]

Done.

+};
+static_assert(arraysize(kContentSettingNames) <= CONTENT_SETTING_NUM_SETTINGS,

[Bernhard Bauer, 2015/10/07 09:32:04]

You want == here.

[Deepak, 2015/10/07 11:12:24]

Done.

+              "kContentSettingNames has an unexpected number of elements");
+}  // namespace
+
 TEST(ContentSettingsUtilsTest, ParsePatternString) {
   content_settings::PatternPair pattern_pair;
 
@@ -44,3 +57,22 @@ TEST(ContentSettingsUtilsTest, ParsePatternString) {
   EXPECT_FALSE(pattern_pair.first.IsValid());
   EXPECT_FALSE(pattern_pair.second.IsValid());
 }
+
+TEST(ContentSettingsUtilsTest, ContentSettingsStringMap) {
+  ContentSetting setting;

[Bernhard Bauer, 2015/10/07 09:32:04]

Move this into the loop to reduce scope.

[Deepak, 2015/10/07 11:12:24]

Done.

+  for (size_t type = 0; type < arraysize(kContentSettingNames); ++type) {
+    setting = static_cast<ContentSetting>(type);
+    EXPECT_EQ(kContentSettingNames[type],
+              content_settings::ContentSettingToString(setting));
+  }
+  for (size_t type = 0; type < arraysize(kContentSettingNames); ++type) {

[Bernhard Bauer, 2015/10/07 09:32:04]

Just combine this with the previous loop.

[Deepak, 2015/10/07 11:12:24]

Done.

+    ContentSetting index_setting_type = static_cast<ContentSetting>(type);
+    if (type == 0)

[Bernhard Bauer, 2015/10/07 09:32:04]

Braces for multi-line bodies.

[Deepak, 2015/10/07 11:12:24]

Done.

+      EXPECT_FALSE(content_settings::ContentSettingFromString(
+          kContentSettingNames[type], &setting));
+    else
+      EXPECT_TRUE(content_settings::ContentSettingFromString(
+          kContentSettingNames[type], &setting));
+    EXPECT_EQ(index_setting_type, setting);
+  }
+}