PART2: Make SignedSettings use proper Value types instead of string all around the place.

chrome/browser/chromeos/proxy_config_service_impl.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/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/json/json_value_serializer.h"
 #include "base/logging.h"
@@ skipping 638 matching lines @@
   CheckCurrentlyOnIOThread();
   if (config_availability_ == net::ProxyConfigService::CONFIG_VALID) {
     VLOG(1) << "returning proxy mode=" << cached_config_.mode;
     cached_config_.ToNetProxyConfig(net_config);
   }
   return config_availability_;
 }
 
 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) << "Error retrieving proxy setting from device";
     device_config_.clear();
     return;
   }
-  VLOG(1) << "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();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
@@ skipping 170 matching lines @@
 
 void ProxyConfigServiceImpl::CheckCurrentlyOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void ProxyConfigServiceImpl::CheckCurrentlyOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 }  // namespace chromeos