more changes

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index b5a270473bff64cef11990be8c015b842606b57b..c622584d17aeeba4beec128778e753aed0bc0143 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -132,13 +132,13 @@ DictionaryValue* GetExceptionForPage(
   DictionaryValue* exception = new DictionaryValue();
   exception->Set(
       kDisplayPattern,
-      new StringValue(pattern.ToString()));
+      base::StringValue::New(pattern.ToString()));
   exception->Set(
       kSetting,
-      new StringValue(ContentSettingToString(setting)));
+      base::StringValue::New(ContentSettingToString(setting)));
   exception->Set(
       kSource,
-      new StringValue(provider_name));
+      base::StringValue::New(provider_name));
   return exception;
 }
 
@@ -151,16 +151,17 @@ DictionaryValue* GetGeolocationExceptionForPage(const GURL& origin,
   DictionaryValue* exception = new DictionaryValue();
   exception->Set(
       kDisplayPattern,
-      new StringValue(GeolocationExceptionToString(origin, embedding_origin)));
+      base::StringValue::New(
+          GeolocationExceptionToString(origin, embedding_origin)));
   exception->Set(
       kSetting,
-      new StringValue(ContentSettingToString(setting)));
+      base::StringValue::New(ContentSettingToString(setting)));
   exception->Set(
       kOrigin,
-      new StringValue(origin.spec()));
+      base::StringValue::New(origin.spec()));
   exception->Set(
       kEmbeddingOrigin,
-      new StringValue(embedding_origin.spec()));
+      base::StringValue::New(embedding_origin.spec()));
   return exception;
 }
 
@@ -173,13 +174,13 @@ DictionaryValue* GetNotificationExceptionForPage(
   DictionaryValue* exception = new DictionaryValue();
   exception->Set(
       kDisplayPattern,
-      new StringValue(content_settings_helper::OriginToString(url)));
+      base::StringValue::New(content_settings_helper::OriginToString(url)));
   exception->Set(
       kSetting,
-      new StringValue(ContentSettingToString(setting)));
+      base::StringValue::New(ContentSettingToString(setting)));
   exception->Set(
       kOrigin,
-      new StringValue(url.spec()));
+      base::StringValue::New(url.spec()));
   return exception;
 }
 
@@ -388,8 +389,7 @@ bool ContentSettingsHandler::GetDefaultSettingManagedFromModel(
 void ContentSettingsHandler::UpdateHandlersEnabledRadios() {
 #if defined(ENABLE_REGISTER_PROTOCOL_HANDLER)
   DCHECK(web_ui_);
-  base::FundamentalValue handlers_enabled(
-      GetProtocolHandlerRegistry()->enabled());
+  base::BooleanValue handlers_enabled(GetProtocolHandlerRegistry()->enabled());
 
   web_ui_->CallJavascriptFunction("ContentSettings.updateHandlersEnabledRadios",
       handlers_enabled);
@@ -694,9 +694,9 @@ void ContentSettingsHandler::CheckExceptionPatternValidity(
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString(pattern_string);
 
-  scoped_ptr<Value> mode_value(Value::CreateStringValue(mode_string));
-  scoped_ptr<Value> pattern_value(Value::CreateStringValue(pattern_string));
-  scoped_ptr<Value> valid_value(Value::CreateBooleanValue(pattern.IsValid()));
+  scoped_ptr<Value> mode_value(base::StringValue::New(mode_string));
+  scoped_ptr<Value> pattern_value(base::StringValue::New(pattern_string));
+  scoped_ptr<Value> valid_value(base::BooleanValue::New(pattern.IsValid()));
 
   web_ui_->CallJavascriptFunction(
       "ContentSettings.patternValidityCheckComplete",