more changes

chrome/browser/policy/device_policy_cache.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/policy/device_policy_cache.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 86 matching lines @@
 // Decodes a protobuf integer to an IntegerValue. The caller assumes ownership
 // of the return Value*. Returns NULL in case the input value is out of bounds.
 Value* DecodeIntegerValue(google::protobuf::int64 value) {
   if (value < std::numeric_limits<int>::min() ||
       value > std::numeric_limits<int>::max()) {
     LOG(WARNING) << "Integer value " << value
                  << " out of numeric limits, ignoring.";
     return NULL;
   }
 
-  return Value::CreateIntegerValue(static_cast<int>(value));
+  return base::NumberValue::New(static_cast<int>(value));
 }
 
 }  // namespace
 
 namespace policy {
 
 DevicePolicyCache::DevicePolicyCache(
     CloudPolicyDataStore* data_store,
     EnterpriseInstallAttributes* install_attributes)
     : data_store_(data_store),
@@ skipping 200 matching lines @@
                      DecodeIntegerValue(
                          container.device_policy_refresh_rate()));
     }
   }
 
   if (policy.has_device_proxy_settings()) {
     const em::DeviceProxySettingsProto container =
         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()));
     }
   }
 
   if (policy.has_release_channel() &&
       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.
     chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
   }
 }
 
 }  // namespace policy