Store base::Value in ContentSettingPatternSource instead of an enum

chrome/browser/ui/webui/options/content_settings_handler.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 "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 820 matching lines @@
   for (ContentSettingsForOneType::iterator i = all_settings.begin();
        i != all_settings.end(); ++i) {
     // Don't add default settings.
     if (i->primary_pattern == ContentSettingsPattern::Wildcard() &&
         i->secondary_pattern == ContentSettingsPattern::Wildcard() &&
         i
           ->source != site_settings::kPreferencesSource) {
       continue;
     }
     all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
-        [i->secondary_pattern] = i->setting;
+                         [i->secondary_pattern] = i->GetContentSetting();
   }
 
   base::ListValue exceptions;
   AddExceptionsGrantedByHostedApps(
       profile,
       HostedAppHasPermission<APIPermission::kGeolocation>,
       &exceptions);
 
   for (site_settings::AllPatternsSettings::iterator i =
       all_patterns_settings.begin(); i != all_patterns_settings.end(); ++i) {
@@ skipping 50 matching lines @@
        i != settings.end();
        ++i) {
     // Don't add default settings.
     if (i->primary_pattern == ContentSettingsPattern::Wildcard() &&
         i->secondary_pattern == ContentSettingsPattern::Wildcard() &&
         i
           ->source != site_settings::kPreferencesSource) {
       continue;
     }
 
-    exceptions.Append(
-        GetNotificationExceptionForPage(i->primary_pattern,
-                                        i->secondary_pattern,
-                                        i->setting,
-                                        i->source));
+    exceptions.Append(GetNotificationExceptionForPage(
+        i->primary_pattern, i->secondary_pattern, i->GetContentSetting(),
+        i->source));
   }
 
   base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
   // This is mainly here to keep this function ideologically parallel to
   // UpdateExceptionsViewFromHostContentSettingsMap().
   UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
@@ skipping 558 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::Value(enable_exceptions));
 }
 
 }  // namespace options