Making structure for ContentSettings and its corresponding strings.

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index 0030797ab026950e9cab4f087aa0ec9dcef5816f..011eb69a54ba76e4a25c4c2eb009b255d5d5faa1 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -25,6 +25,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/content_settings.h"
+#include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/plugin_service.h"
@@ -163,8 +164,11 @@ bool ContentSettingsContentSettingGetFunction::RunSync() {
   }
 
   base::DictionaryValue* result = new base::DictionaryValue();
-  result->SetString(keys::kContentSettingKey,
-                    helpers::ContentSettingToString(setting));
+  std::string setting_string;
+  bool return_value =
+      content_settings::ContentSettingToString(setting, &setting_string);
+  DCHECK(return_value);
+  result->SetString(keys::kContentSettingKey, setting_string);
 
   SetResult(result);
 
@@ -208,7 +212,7 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
       params->details.setting->GetAsString(&setting_str));
   ContentSetting setting;
   EXTENSION_FUNCTION_VALIDATE(
-      helpers::StringToContentSetting(setting_str, &setting));
+      content_settings::ContentSettingFromString(setting_str, &setting));
   EXTENSION_FUNCTION_VALIDATE(HostContentSettingsMap::IsSettingAllowedForType(
       GetProfile()->GetPrefs(), setting, content_type));
 
@@ -238,9 +242,14 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
         DCHECK(false) << "No human-readable type name defined for this type.";
     }
 
+    std::string setting_string;
+    bool return_value =
+        content_settings::ContentSettingToString(setting, &setting_string);
+    DCHECK(return_value);
+
     error_ = base::StringPrintf(
         kUnsupportedDefaultSettingError,
-        content_settings_helpers::ContentSettingToString(setting),
+        setting_string.c_str(),

[Bernhard Bauer, 2015/10/07 11:38:21]

Actually, just pass in |setting_str| here -- we already have that!

[Deepak, 2015/10/07 13:54:43]

Done.

         readable_type_name.c_str());
     return false;
   }