Store base::Value in ContentSettingPatternSource instead of an enum

chrome/renderer/content_settings_observer.cc

Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 9d26b8953df87e88cad9ac7cd33e9449188f1700..423e353b49dd03b1fcbb5e47f7098802d33d291f 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/common/render_messages.h"
 #include "chrome/common/ssl_insecure_content.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_frame.h"
@@ -71,14 +72,15 @@ ContentSetting GetContentSettingFromRules(
   if (rules.size() == 1) {
     DCHECK(rules[0].primary_pattern == ContentSettingsPattern::Wildcard());
     DCHECK(rules[0].secondary_pattern == ContentSettingsPattern::Wildcard());
-    return rules[0].setting;
+    return content_settings::ValueToContentSetting(
+        rules[0].setting_value.get());
   }
   const GURL& primary_url = GetOriginOrURL(frame);
   const GURL& secondary_gurl = secondary_url;
   for (it = rules.begin(); it != rules.end(); ++it) {
     if (it->primary_pattern.Matches(primary_url) &&
         it->secondary_pattern.Matches(secondary_gurl)) {
-      return it->setting;
+      return content_settings::ValueToContentSetting(it->setting_value.get());
     }
   }
   NOTREACHED();