NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/proxy_config_service_impl.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 555 matching lines @@
   VLOG(1) << "OnNetworkChanged: "
           << (network->name().empty() ? network->service_path() :
                                         network->name())
           << ", use-shared-proxies=" << GetUseSharedProxies();
   // We only care about active network.
   if (network == network_lib->active_network())
     OnActiveNetworkChanged(network_lib, network);
 }
 
 // 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;
   ProxyConfigDictionary proxy_dict(static_cast<DictionaryValue*>(value.get()));
   return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(proxy_dict,
                                                            proxy_config);
 }
 
 // static
 void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) {
@@ skipping 160 matching lines @@
   if (network) {
     // If we're activating proxy, ignore proxy if necessary;
     // otherwise, for ui, get actual proxy to show user.
     ignore_proxy = activate ? IgnoreProxy(network) : false;
     // If network is shared but use-shared-proxies is off, use direct mode.
     if (ignore_proxy) {
       VLOG(1) << "Shared network && !use-shared-proxies, use direct";
       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;
       }
     }
   }
 
   // Determine effective proxy config, either from prefs or network.
   ProxyPrefs::ConfigState effective_config_state;
   net::ProxyConfig effective_config;
@@ skipping 103 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos