Store base::Value in ContentSettingPatternSource instead of an enum

components/content_settings/core/common/content_settings_struct_traits.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_STRUCT_TRAITS_H
 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_STRUCT_TRAITS_H
 
 #include <string>
 
+#include "base/memory/ptr_util.h"
+#include "base/values.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings.mojom.h"
+#include "mojo/common/values_struct_traits.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 
 namespace mojo {
 
 template <>
 struct StructTraits<content_settings::mojom::PatternPartsDataView,
                     ContentSettingsPattern::PatternParts> {
   static const std::string& scheme(
       const ContentSettingsPattern::PatternParts& r) {
@@ skipping 67 matching lines @@
   static const ContentSettingsPattern& primary_pattern(
       const ContentSettingPatternSource& r) {
     return r.primary_pattern;
   }
 
   static const ContentSettingsPattern& secondary_pattern(
       const ContentSettingPatternSource& r) {
     return r.secondary_pattern;
   }
 
-  static ContentSetting setting(const ContentSettingPatternSource& r) {
-    return r.setting;
+  static const std::unique_ptr<base::Value>& setting_value(
+      const ContentSettingPatternSource& r) {
+    return r.setting_value;
   }
 
   static const std::string& source(const ContentSettingPatternSource& r) {
     return r.source;
   }
 
   static bool incognito(const ContentSettingPatternSource& r) {
     return r.incognito;
   }
 
@@ skipping 22 matching lines @@
   }
 
   static bool Read(
       content_settings::mojom::RendererContentSettingRulesDataView data,
       RendererContentSettingRules* out);
 };
 
 }  // namespace mojo
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_STRUCT_TRAITS_H