Making structure for ContentSettings and its corresponding strings.

chrome/browser/extensions/api/content_settings/content_settings_api.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_api.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"
 #include "chrome/browser/extensions/api/preference/preference_helpers.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_installer.h"
 #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"
 #include "extensions/browser/extension_prefs_scope.h"
 #include "extensions/common/error_utils.h"
 
 using content::BrowserThread;
 using content::PluginService;
 
 namespace Clear = extensions::api::content_settings::ContentSetting::Clear;
@@ skipping 118 matching lines @@
     // TODO(jochen): Do we return the value for setting or for reading cookies?
     bool setting_cookie = false;
     setting = cookie_settings->GetCookieSetting(primary_url, secondary_url,
                                                 setting_cookie, NULL);
   } else {
     setting = map->GetContentSetting(primary_url, secondary_url, content_type,
                                      resource_identifier);
   }
 
   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);
 
   return true;
 }
 
 bool ContentSettingsContentSettingSetFunction::RunSync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ skipping 23 matching lines @@
 
   std::string resource_identifier;
   if (params->details.resource_identifier.get())
     resource_identifier = params->details.resource_identifier->id;
 
   std::string setting_str;
   EXTENSION_FUNCTION_VALIDATE(
       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));
 
   // Some content setting types support the full set of values listed in
   // content_settings.json only for exceptions. For the default setting,
   // some values might not be supported.
   // For example, camera supports [allow, ask, block] for exceptions, but only
   // [ask, block] for the default setting.
   if (primary_pattern == ContentSettingsPattern::Wildcard() &&
       secondary_pattern == ContentSettingsPattern::Wildcard() &&
       !HostContentSettingsMap::IsDefaultSettingAllowedForType(
           GetProfile()->GetPrefs(), setting, content_type)) {
     static const char kUnsupportedDefaultSettingError[] =
         "'%s' is not supported as the default setting of %s.";
 
     // TODO(msramek): Get the same human readable name as is presented
     // externally in the API, i.e. chrome.contentSettings.<name>.set().
     std::string readable_type_name;
     switch (content_type) {
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
         readable_type_name = "microphone";
         break;
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
         readable_type_name = "camera";
         break;
       default:
         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;
   }
 
   ExtensionPrefsScope scope = kExtensionPrefsScopeRegular;
   bool incognito = false;
   if (params->details.scope ==
       api::content_settings::SCOPE_INCOGNITO_SESSION_ONLY) {
     scope = kExtensionPrefsScopeIncognitoSessionOnly;
     incognito = true;
@@ skipping 65 matching lines @@
   SetResult(list);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           &ContentSettingsContentSettingGetResourceIdentifiersFunction::
           SendResponse,
           this,
           true));
 }
 
 }  // namespace extensions