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..32f4e4da2874a66ddad2f45159a6be23ad1f1274 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"
@@ -164,7 +165,7 @@ bool ContentSettingsContentSettingGetFunction::RunSync() {
 
   base::DictionaryValue* result = new base::DictionaryValue();
   result->SetString(keys::kContentSettingKey,
-                    helpers::ContentSettingToString(setting));
+                    content_settings::ContentSettingToString(setting));
 
   SetResult(result);
 
@@ -206,9 +207,9 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
   std::string setting_str;
   EXTENSION_FUNCTION_VALIDATE(
       params->details.setting->GetAsString(&setting_str));
-  ContentSetting setting;
-  EXTENSION_FUNCTION_VALIDATE(
-      helpers::StringToContentSetting(setting_str, &setting));
+  ContentSetting setting =
+      content_settings::ContentSettingFromString(setting_str);
+  DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);

[Bernhard Bauer, 2015/10/05 14:31:48]

Sorry, this is the wrong way around (and a DCHECK is not the same thing as
EXTENSION_FUNCTION_VALIDATE!).

What I meant was: Keep the signature that returns a bool and write to an output
parameter, and change call sites with the other signature to that. That way, we
can have code that asserts the string is valid (by DCHECKing the return value),
or code that handles invalid strings in a different way (like here). You can't
do it if the conversion function already does the DCHECK.

[Deepak, 2015/10/06 15:18:41]

Done.

   EXTENSION_FUNCTION_VALIDATE(HostContentSettingsMap::IsSettingAllowedForType(
       GetProfile()->GetPrefs(), setting, content_type));
 
@@ -240,7 +241,7 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
 
     error_ = base::StringPrintf(
         kUnsupportedDefaultSettingError,
-        content_settings_helpers::ContentSettingToString(setting),
+        content_settings::ContentSettingToString(setting).c_str(),
         readable_type_name.c_str());
     return false;
   }