more changes

chrome/browser/content_settings/content_settings_pref_provider.cc

 // Copyright (c) 2011 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/content_settings/content_settings_pref_provider.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 167 matching lines @@
     DictionaryValue* default_settings_dictionary = update.Get();
     if ((setting == CONTENT_SETTING_DEFAULT) ||
         (setting == kDefaultSettings[content_type])) {
       default_content_settings_.settings[content_type] =
           kDefaultSettings[content_type];
       default_settings_dictionary->RemoveWithoutPathExpansion(dictionary_path,
                                                               NULL);
     } else {
       default_content_settings_.settings[content_type] = setting;
       default_settings_dictionary->SetWithoutPathExpansion(
-          dictionary_path, Value::CreateIntegerValue(setting));
+          dictionary_path, base::NumberValue::New(setting));
     }
 
     // Keep the obsolete pref in sync as long as backwards compatibility is
     // required. This is required to keep sync working correctly.
     if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
        prefs_->SetInteger(prefs::kGeolocationDefaultContentSetting,
                           setting == CONTENT_SETTING_DEFAULT ?
                               kDefaultSettings[content_type] : setting);
     }
   }
@@ skipping 284 matching lines @@
           primary_pattern,
           secondary_pattern,
           content_type,
           resource_identifier);
     } else {
       map_to_modify->SetValue(
           primary_pattern,
           secondary_pattern,
           content_type,
           resource_identifier,
-          Value::CreateIntegerValue(setting));
+          base::NumberValue::New(setting));
     }
   }
 
   // Update the content settings preference.
   if (!is_incognito_) {
     UpdatePref(primary_pattern,
                secondary_pattern,
                content_type,
                resource_identifier,
                setting);
@@ skipping 157 matching lines @@
               int setting = CONTENT_SETTING_DEFAULT;
               found = resource_dictionary->GetIntegerWithoutPathExpansion(
                   resource_identifier, &setting);
               DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
               setting = ClickToPlayFixup(content_type,
                                          ContentSetting(setting));
               value_map_.SetValue(pattern_pair.first,
                                   pattern_pair.second,
                                   content_type,
                                   resource_identifier,
-                                  Value::CreateIntegerValue(setting));
+                                  base::NumberValue::New(setting));
             }
           }
         } else if (kTypeNames[i]) {
           const std::string content_type_str(kTypeNames[i]);
           int setting = CONTENT_SETTING_DEFAULT;
           if (settings_dictionary->GetIntegerWithoutPathExpansion(
                   content_type_str, &setting)) {
             DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
             setting = FixObsoleteCookiePromptMode(content_type,
                                                   ContentSetting(setting));
             setting = ClickToPlayFixup(content_type,
                                        ContentSetting(setting));
             value_map_.SetValue(pattern_pair.first,
                                 pattern_pair.second,
                                 content_type,
                                 ResourceIdentifier(""),
-                                Value::CreateIntegerValue(setting));
+                                base::NumberValue::New(setting));
           }
         }
       }
     }
   }
 }
 
 void PrefProvider::UpdatePatternsPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
@@ skipping 32 matching lines @@
       // Update resource dictionary.
       if (setting == CONTENT_SETTING_DEFAULT) {
         resource_dictionary->RemoveWithoutPathExpansion(resource_identifier,
                                                         NULL);
         if (resource_dictionary->empty()) {
           settings_dictionary->RemoveWithoutPathExpansion(
               res_dictionary_path, NULL);
         }
       } else {
         resource_dictionary->SetWithoutPathExpansion(
-            resource_identifier, Value::CreateIntegerValue(setting));
+            resource_identifier, base::NumberValue::New(setting));
       }
     } else {
       // Update settings dictionary.
       std::string setting_path(kTypeNames[content_type]);
       if (setting == CONTENT_SETTING_DEFAULT) {
         settings_dictionary->RemoveWithoutPathExpansion(setting_path,
                                                         NULL);
       } else {
         settings_dictionary->SetWithoutPathExpansion(
-            setting_path, Value::CreateIntegerValue(setting));
+            setting_path, base::NumberValue::New(setting));
       }
     }
     // Remove the settings dictionary if it is empty.
     if (settings_dictionary->empty()) {
       all_settings_dictionary->RemoveWithoutPathExpansion(
           pattern_str, NULL);
     }
   }
 }
 
@@ skipping 36 matching lines @@
       // Update resource dictionary.
       if (setting == CONTENT_SETTING_DEFAULT) {
         resource_dictionary->RemoveWithoutPathExpansion(resource_identifier,
                                                         NULL);
         if (resource_dictionary->empty()) {
           settings_dictionary->RemoveWithoutPathExpansion(
               res_dictionary_path, NULL);
         }
       } else {
         resource_dictionary->SetWithoutPathExpansion(
-            resource_identifier, Value::CreateIntegerValue(setting));
+            resource_identifier, base::NumberValue::New(setting));
       }
     } else {
       // Update settings dictionary.
       std::string setting_path(kTypeNames[content_type]);
       if (setting == CONTENT_SETTING_DEFAULT) {
         settings_dictionary->RemoveWithoutPathExpansion(setting_path,
                                                         NULL);
       } else {
         settings_dictionary->SetWithoutPathExpansion(
-            setting_path, Value::CreateIntegerValue(setting));
+            setting_path, base::NumberValue::New(setting));
       }
     }
     // Remove the settings dictionary if it is empty.
     if (settings_dictionary->empty()) {
       all_settings_dictionary->RemoveWithoutPathExpansion(
           pattern_str, NULL);
     }
   }
 }
 
@@ skipping 247 matching lines @@
       DCHECK(found);
       std::string new_key = pattern_pair.first.ToString();
       // Existing values are overwritten.
       obsolete_settings_dictionary->SetWithoutPathExpansion(
           new_key, dictionary->DeepCopy());
     }
   }
 }
 
 }  // namespace content_settings