Index: chrome/browser/ui/webui/chromeos/login/network_state_informer.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc |
index 1c9ea71cae30565971b3d77707cf26d39a0132e3..d14c2663798a9ab844331e80aec00aab873ea04e 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/browser/chromeos/login/screens/error_screen_actor.h" |
#include "chrome/browser/chromeos/proxy_config_service_impl.h" |
#include "chrome/common/chrome_notification_types.h" |
+#include "chromeos/network/network_state_handler.h" |
#include "net/proxy/proxy_config.h" |
namespace { |
@@ -210,18 +211,16 @@ NetworkStateInformer::State NetworkStateInformer::GetNetworkState( |
bool NetworkStateInformer::IsProxyConfigured(const Network* network) { |
DCHECK(network); |
- ProxyStateMap::iterator it = proxy_state_map_.find(network->unique_id()); |
- if (it != proxy_state_map_.end() && |
- it->second.proxy_config == network->proxy_config()) { |
- return it->second.configured; |
- } |
+ const NetworkState* network_state = |
+ NetworkStateHandler::Get()->GetNetworkState(network->service_path()); |
+ DCHECK(network_state); |
+ |
net::ProxyConfig proxy_config; |
- if (!ProxyConfigServiceImpl::ParseProxyConfig(network, &proxy_config)) |
+ if (!ProxyConfigServiceImpl::ParseProxyConfig(*network_state, |
+ &proxy_config)) { |
return false; |
- bool configured = !proxy_config.proxy_rules().empty(); |
- proxy_state_map_[network->unique_id()] = |
- ProxyState(network->proxy_config(), configured); |
- return configured; |
+ } |
+ return !proxy_config.proxy_rules().empty(); |
} |
} // namespace chromeos |