Move pref names and default value into WebsiteSettingsInfo

components/content_settings/core/browser/website_settings_info.h

Index: components/content_settings/core/browser/website_settings_info.h
diff --git a/components/content_settings/core/browser/website_settings_info.h b/components/content_settings/core/browser/website_settings_info.h
index 435b9df0666c902a89462d4673b9eef91cae638f..79cd01a469a16c1453bb7b17668c21990b637dea 100644
--- a/components/content_settings/core/browser/website_settings_info.h
+++ b/components/content_settings/core/browser/website_settings_info.h
@@ -10,22 +10,39 @@
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
+namespace base {
+class Value;
+}  // namespace base
+
 namespace content_settings {
 
 // This class stores the properties related to a website setting.
 // TODO(raymes): Move more properties into this class.
 class WebsiteSettingsInfo {
  public:
-  WebsiteSettingsInfo(ContentSettingsType type, const std::string& name);
+  // Ownership of |default_value| remains with the caller.

[Bernhard Bauer, 2015/07/29 10:12:38]

Should be |initial_default_value| (although, isn't that redundant? Can the
default value change?). Also, can you pass the pointer as const?

[raymes, 2015/07/30 05:25:03]

Yeah, the default value can change. This is the initial value that the pref will
be set to. But that can then be changed later by the user. That's why I wanted
to make it explicit :)

I changed the pointer.

+  WebsiteSettingsInfo(ContentSettingsType type,
+                      const std::string& name,
+                      base::Value* initial_default_value);
   ~WebsiteSettingsInfo();
 
   ContentSettingsType type() const { return type_; }
   const std::string& name() const { return name_; }
 
+  const std::string& pref_name() const { return pref_name_; }
+  const std::string& default_value_pref_name() const {
+    return default_value_pref_name_;
+  }
+  int32_t initial_default_value() const { return initial_default_value_; }
+
  private:
   const ContentSettingsType type_;
   const std::string name_;
 
+  const std::string pref_name_;
+  const std::string default_value_pref_name_;
+  int32_t initial_default_value_;

[msramek, 2015/07/29 09:20:07]

Just int? This is mapped to Prefs::GetInteger(), resp.
base::Value::GetAsInteger(), both of them work with ints.

[Bernhard Bauer, 2015/07/29 10:12:38]

Yes please. The style guide says to use int unless you need the value to be
exactly 32 bits in size.

[raymes, 2015/07/30 05:25:03]

Thanks. Sorry about this - this is something I'm going to have to get used to.

+
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
 };