Making structure for ContentSettings and its corresponding strings.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 
 #include <set>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
@@ skipping 255 matching lines @@
                               rule.secondary_pattern.ToString());
       setting_dict->SetString(
           keys::kContentSettingsTypeKey,
           helpers::ContentSettingsTypeToString(it->first.content_type));
       setting_dict->SetString(keys::kResourceIdentifierKey,
                               it->first.resource_identifier);
       ContentSetting content_setting = ValueToContentSetting(rule.value.get());
       DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting);
       setting_dict->SetString(
           keys::kContentSettingKey,
-          helpers::ContentSettingToString(content_setting));
+          content_settings::ContentSettingToString(content_setting));
       settings->Append(setting_dict);
     }
   }
   return settings;
 }
 
 void ContentSettingsStore::SetExtensionContentSettingFromList(
     const std::string& extension_id,
     const base::ListValue* list,
     ExtensionPrefsScope scope) {
@@ skipping 20 matching lines @@
     dict->GetString(keys::kContentSettingsTypeKey, &content_settings_type_str);
     ContentSettingsType content_settings_type =
         helpers::StringToContentSettingsType(content_settings_type_str);
     DCHECK_NE(CONTENT_SETTINGS_TYPE_DEFAULT, content_settings_type);
 
     std::string resource_identifier;
     dict->GetString(keys::kResourceIdentifierKey, &resource_identifier);
 
     std::string content_setting_string;
     dict->GetString(keys::kContentSettingKey, &content_setting_string);
-    ContentSetting setting = CONTENT_SETTING_DEFAULT;
-    bool result =
-        helpers::StringToContentSetting(content_setting_string, &setting);
-    DCHECK(result);
+    ContentSetting setting =
+        content_settings::ContentSettingFromString(content_setting_string);
+    DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
 
     SetExtensionContentSetting(extension_id,
                                primary_pattern,
                                secondary_pattern,
                                content_settings_type,
                                resource_identifier,
                                setting,
                                scope);
   }
 }
@@ skipping 37 matching lines @@
 ContentSettingsStore::FindEntry(const std::string& ext_id) const {
   ExtensionEntryMap::const_iterator i;
   for (i = entries_.begin(); i != entries_.end(); ++i) {
     if (i->second->id == ext_id)
       return i;
   }
   return entries_.end();
 }
 
 }  // namespace extensions