diff options
author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 13:10:36 +0000 |
---|---|---|
committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 13:10:36 +0000 |
commit | 6c2b810e1d54b0a461afb2c089667258c1a61707 (patch) | |
tree | ed3414178390e2280d8191738c50e6b9e793f17c /chrome/browser/chromeos/proxy_config_service_impl.cc | |
parent | 291890fe382d85cd43041a6da7cb634f39b0f36a (diff) | |
download | chromium_src-6c2b810e1d54b0a461afb2c089667258c1a61707.zip chromium_src-6c2b810e1d54b0a461afb2c089667258c1a61707.tar.gz chromium_src-6c2b810e1d54b0a461afb2c089667258c1a61707.tar.bz2 |
Make SignedSettings use proper Value types instead of string all around the place.
Extra: Add ListValue support to the bunch and Userlist handling through Retrieve/StorePropertyOp.
BUG=chromium-os:14054
TEST=unit_tests:*Signed*
Review URL: http://codereview.chromium.org/8091002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.cc')
-rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 97b6aef..bd37a46 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -526,17 +526,23 @@ void ProxyConfigServiceImpl::OnProxyConfigChanged( void ProxyConfigServiceImpl::OnSettingsOpCompleted( SignedSettings::ReturnCode code, - std::string value) { + const base::Value* value) { + // We assume ownership here to make sure this gets deleted no matter where + // this function ends. + scoped_ptr<const base::Value> own_value(value); + retrieve_property_op_ = NULL; if (code != SignedSettings::SUCCESS) { LOG(WARNING) << this << ": Error retrieving proxy setting from device"; device_config_.clear(); return; } - VLOG(1) << this << ": Retrieved proxy setting from device, value=[" - << value << "]"; + std::string policy_value; + value->GetAsString(&policy_value); + VLOG(1) << "Retrieved proxy setting from device, value=[" + << policy_value << "]"; ProxyConfig device_config; - if (!device_config.DeserializeForDevice(value) || + if (!device_config.DeserializeForDevice(policy_value) || !device_config.SerializeForNetwork(&device_config_)) { LOG(WARNING) << "Can't deserialize device setting or serialize for network"; device_config_.clear(); |