NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/proxy_config_service_impl.cc

Index: chrome/browser/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 71ba9761f9244b6cbc7e694ae0223396155520e1..e56a23d74ab54383bc19dd791556ccc18e112e86 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -573,11 +573,11 @@ void ProxyConfigServiceImpl::OnNetworkChanged(NetworkLibrary* network_lib,
 }
 
 // static
-bool ProxyConfigServiceImpl::ParseProxyConfig(const Network* network,
-                                              net::ProxyConfig* proxy_config) {
-  if (!network || !proxy_config)
+bool ProxyConfigServiceImpl::ParseProxyConfig(
+    const std::string& proxy_config_string, net::ProxyConfig* proxy_config) {

[stevenjb, 2013/05/14 15:46:16]

args on separate lines

[gauravsh, 2013/05/14 21:51:15]

Done.

+  if (!proxy_config)
     return false;
-  JSONStringValueSerializer serializer(network->proxy_config());
+  JSONStringValueSerializer serializer(proxy_config_string);
   scoped_ptr<Value> value(serializer.Deserialize(NULL, NULL));
   if (!value.get() || value->GetType() != Value::TYPE_DICTIONARY)
     return false;
@@ -758,7 +758,7 @@ void ProxyConfigServiceImpl::DetermineEffectiveConfig(const Network* network,
       network_availability = net::ProxyConfigService::CONFIG_VALID;
     } else if (!network->proxy_config().empty()) {
       // Network is private or shared with user using shared proxies.
-      if (ParseProxyConfig(network, &network_config)) {
+      if (ParseProxyConfig(network->proxy_config(), &network_config)) {
         VLOG(1) << this << ": using network proxy: "
                 << network->proxy_config();
         network_availability = net::ProxyConfigService::CONFIG_VALID;