Store base::Value in ContentSettingPatternSource instead of an enum

chrome/browser/ui/webui/site_settings_helper.cc

 // 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.
 
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 
 #include <functional>
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/permissions/chooser_context_base.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
 #include "components/prefs/pref_service.h"
 #include "extensions/browser/extension_registry.h"
 
 namespace site_settings {
 
 const char kAppName[] = "appName";
 const char kAppId[] = "appId";
 const char kSetting[] = "setting";
 const char kOrigin[] = "origin";
 const char kDisplayName[] = "displayName";
@@ skipping 167 matching lines @@
 
     // Off-the-record HostContentSettingsMap contains incognito content settings
     // as well as normal content settings. Here, we use the incongnito settings
     // only.
     if (map->is_incognito() && !i->incognito)
       continue;
 
     if (filter && i->primary_pattern.ToString() != *filter)
       continue;
 
-    all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
-        [i->secondary_pattern] = i->setting;
+    all_patterns_settings[std::make_pair(i->primary_pattern,
+                                         i->source)][i->secondary_pattern] =
+        content_settings::ValueToContentSetting(i->setting_value.get());
   }
 
   // Keep the exceptions sorted by provider so they will be displayed in
   // precedence order.
   std::vector<std::unique_ptr<base::DictionaryValue>>
       all_provider_exceptions[HostContentSettingsMap::NUM_PROVIDER_TYPES];
 
   // |all_patterns_settings| is sorted from the lowest precedence pattern to
   // the highest (see operator< in ContentSettingsPattern), so traverse it in
   // reverse to show the patterns with the highest precedence (the more specific
@@ skipping 238 matching lines @@
     }
   }
 
   for (auto& one_provider_exceptions : all_provider_exceptions) {
     for (auto& exception : one_provider_exceptions)
       exceptions->Append(std::move(exception));
   }
 }
 
 }  // namespace site_settings