more changes

chrome/browser/policy/device_policy_cache.cc

Index: chrome/browser/policy/device_policy_cache.cc
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc
index 4fa397ba6a42882ba14588d81abb2a75e23d486e..e6bfb010aaafe484b207fc2c3c6c3d4e0416a28e 100644
--- a/chrome/browser/policy/device_policy_cache.cc
+++ b/chrome/browser/policy/device_policy_cache.cc
@@ -104,7 +104,7 @@ Value* DecodeIntegerValue(google::protobuf::int64 value) {
     return NULL;
   }
 
-  return Value::CreateIntegerValue(static_cast<int>(value));
+  return base::NumberValue::New(static_cast<int>(value));
 }
 
 }  // namespace
@@ -325,19 +325,19 @@ void DevicePolicyCache::DecodeDevicePolicy(
         policy.device_proxy_settings();
     if (container.has_proxy_mode()) {
       recommended->Set(kPolicyProxyMode,
-                       Value::CreateStringValue(container.proxy_mode()));
+                       base::StringValue::New(container.proxy_mode()));
     }
     if (container.has_proxy_server()) {
       recommended->Set(kPolicyProxyServer,
-                       Value::CreateStringValue(container.proxy_server()));
+                       base::StringValue::New(container.proxy_server()));
     }
     if (container.has_proxy_pac_url()) {
       recommended->Set(kPolicyProxyPacUrl,
-                       Value::CreateStringValue(container.proxy_pac_url()));
+                       base::StringValue::New(container.proxy_pac_url()));
     }
     if (container.has_proxy_bypass_list()) {
       recommended->Set(kPolicyProxyBypassList,
-                       Value::CreateStringValue(container.proxy_bypass_list()));
+                       base::StringValue::New(container.proxy_bypass_list()));
     }
   }
 
@@ -345,7 +345,7 @@ void DevicePolicyCache::DecodeDevicePolicy(
       policy.release_channel().has_release_channel()) {
     std::string channel = policy.release_channel().release_channel();
     mandatory->Set(
-        kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel));
+        kPolicyChromeOsReleaseChannel, base::StringValue::New(channel));
     // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
     // have to pass the channel in here, only ping the update engine to tell
     // it to fetch the channel from the policy.