Store base::Value in ContentSettingPatternSource instead of an enum

components/content_settings/core/browser/host_content_settings_map.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 "components/content_settings/core/browser/host_content_settings_map.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/clock.h"
+#include "base/values.h"
 #include "build/build_config.h"
 #include "components/content_settings/core/browser/content_settings_default_provider.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/content_settings_info.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
 #include "components/content_settings/core/browser/content_settings_policy_provider.h"
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 #include "url/gurl.h"
 
 using content_settings::WebsiteSettingsInfo;
 using content_settings::ContentSettingsInfo;
 
@@ skipping 480 matching lines @@
     if (!content_settings::ContentSettingsRegistry::GetInstance()->Get(type))
       continue;
     ContentSettingsForOneType settings;
     GetSettingsForOneType(type, std::string(), &settings);
 
     for (const ContentSettingPatternSource& setting_entry : settings) {
       // Migrate user preference settings only.
       if (setting_entry.source != "preference")
         continue;
       // Migrate ALLOW settings only.
-      if (setting_entry.setting != CONTENT_SETTING_ALLOW)
+      if (setting_entry.GetContentSetting() != CONTENT_SETTING_ALLOW)
         continue;
       // Skip default settings.
       if (setting_entry.primary_pattern == ContentSettingsPattern::Wildcard())
         continue;
 
       if (setting_entry.secondary_pattern !=
           ContentSettingsPattern::Wildcard()) {
         NOTREACHED();
         continue;
       }
@@ skipping 186 matching lines @@
     const std::string& resource_identifier,
     ContentSettingsForOneType* settings,
     bool incognito) const {
   std::unique_ptr<content_settings::RuleIterator> rule_iterator(
       provider->GetRuleIterator(content_type, resource_identifier, incognito));
   if (!rule_iterator)
     return;
 
   while (rule_iterator->HasNext()) {
     const content_settings::Rule& rule = rule_iterator->Next();
-    ContentSetting setting_value = CONTENT_SETTING_DEFAULT;
+    std::unique_ptr<base::Value> setting_value;
     // TODO(bauerb): Return rules as a list of values, not content settings.
     // Handle the case using base::Values for its exceptions and default
     // setting. Here we assume all the exceptions are granted as
     // |CONTENT_SETTING_ALLOW|.
     if (!content_settings::ContentSettingsRegistry::GetInstance()->Get(
             content_type) &&
         rule.value.get() &&
         rule.primary_pattern != ContentSettingsPattern::Wildcard()) {
-      setting_value = CONTENT_SETTING_ALLOW;
+      setting_value =
+          content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW);
     } else {
-      setting_value = content_settings::ValueToContentSetting(rule.value.get());
+      setting_value = base::MakeUnique<base::Value>(*(rule.value));
     }
     settings->push_back(ContentSettingPatternSource(
-        rule.primary_pattern, rule.secondary_pattern, setting_value,
+        rule.primary_pattern, rule.secondary_pattern, std::move(setting_value),
         kProviderNamesSourceMap[provider_type].provider_name, incognito));
   }
 }
 
 void HostContentSettingsMap::UsedContentSettingsProviders() const {
 #ifndef NDEBUG
   if (used_from_thread_id_ == base::kInvalidThreadId)
     return;
 
   if (base::PlatformThread::CurrentId() != used_from_thread_id_)
@@ skipping 143 matching lines @@
       }
     }
   }
   return std::unique_ptr<base::Value>();
 }
 
 void HostContentSettingsMap::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   pref_provider_->SetClockForTesting(std::move(clock));
 }