Making structure for ContentSettings and its corresponding strings.

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 5baf48d22995ef1c8d8db5290e96216f6a386f1e..ca1f3837653d39b4bc9f9df9a08d9b81b3d6ab41 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -352,7 +352,7 @@ void ContentSettingsHandler::GetLocalizedValues(
     {"cookiesHeader", IDS_COOKIES_HEADER},
     {"cookiesAllow", IDS_COOKIES_ALLOW_RADIO},
     {"cookiesBlock", IDS_COOKIES_BLOCK_RADIO},
-    {"cookiesSession", IDS_COOKIES_SESSION_ONLY_RADIO},
+    {"cookiesSessionOnly", IDS_COOKIES_SESSION_ONLY_RADIO},
     {"cookiesBlock3rdParty", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX},
     {"cookiesShowCookies", IDS_COOKIES_SHOW_COOKIES_BUTTON},
     {"flashStorageSettings", IDS_FLASH_STORAGE_SETTINGS},
@@ -474,7 +474,7 @@ void ContentSettingsHandler::GetLocalizedValues(
 
   int plugin_ids = default_value == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ?
       IDS_PLUGIN_DETECT_RECOMMENDED_RADIO : IDS_PLUGIN_DETECT_RADIO;
-  localized_strings->SetString("pluginsDetect",
+  localized_strings->SetString("pluginsDetectImportantContent",
                                l10n_util::GetStringUTF16(plugin_ids));
 
   RegisterTitle(localized_strings, "contentSettingsPage",
@@ -919,9 +919,14 @@ void ContentSettingsHandler::CompareMediaExceptionsWithFlash(
     dict->GetString(kOrigin, &origin);
     dict->GetString(kSetting, &setting);
 
+    ContentSetting setting_type = CONTENT_SETTING_DEFAULT;
+    bool result =
+        content_settings::ContentSettingFromString(setting, &setting_type);
+    DCHECK(result);
+
     settings.exceptions.push_back(MediaException(
         ContentSettingsPattern::FromString(origin),
-        ContentSettingFromString(setting)));
+        setting_type));
   }
 
   PepperFlashContentSettingsUtils::SortMediaExceptions(
@@ -1321,7 +1326,11 @@ void ContentSettingsHandler::SetContentFilter(const base::ListValue* args) {
     return;
   }
 
-  ContentSetting default_setting = ContentSettingFromString(setting);
+  ContentSetting default_setting = CONTENT_SETTING_DEFAULT;
+  bool result =
+      content_settings::ContentSettingFromString(setting, &default_setting);
+  DCHECK(result);
+
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   Profile* profile = Profile::FromWebUI(web_ui());
 
@@ -1444,11 +1453,17 @@ void ContentSettingsHandler::SetException(const base::ListValue* args) {
     // got destroyed before we received this message.
     if (!settings_map)
       return;
+
+    ContentSetting setting_type = CONTENT_SETTING_DEFAULT;
+    bool result =
+        content_settings::ContentSettingFromString(setting, &setting_type);
+    DCHECK(result);
+
     settings_map->SetContentSetting(ContentSettingsPattern::FromString(pattern),
                                     ContentSettingsPattern::Wildcard(),
                                     type,
                                     std::string(),
-                                    ContentSettingFromString(setting));
+                                    setting_type);
   }
 }