Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

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);

[stevenjb, 2013/05/08 20:32:09]

Ugh. We need to convert this class too asap, mixing the two is not ideal.

It is possible for NetworkStateHandler and NetworkLibrary to be out of sync. We
should return false in that case instead of a DCHECK.

[pneubeck (no reviews), 2013/05/10 10:58:52]

Gaurav does that already in another CL.
I'll rebase onto his.

+
   net::ProxyConfig proxy_config;
-  if (!ProxyConfigServiceImpl::ParseProxyConfig(network, &proxy_config))
+  if (!ProxyConfigServiceImpl::ParseProxyConfig(*network_state,

[stevenjb, 2013/05/08 20:32:09]

I find this mixing of * and & confusing. It seems like ParseProxyConfig() should
take a const*.

That said, this looks like the only place outside of ProxyConfigServiceImpl that
we call ParseProxyConfig. Maybe pass network->service_path() for now instead of
doing the NetworkState lookup here, then make ParseProxyConfig a public wrapper
that does the lookup and calls a local method.

[pneubeck (no reviews), 2013/05/10 10:58:52]

Actually, I'd even like to get rid of this weird dependency entirely. Did that
now.

+                                                &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