Revert 202503 "Revert 202478 "Revert 202388 "Remove NetworkState..."

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

Index: trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc	(revision 202513)
+++ trunk/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc	(working copy)
@@ -7,8 +7,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/browser/prefs/proxy_config_dictionary.h"
-#include "chrome/browser/prefs/proxy_prefs.h"
+#include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
@@ -25,8 +24,7 @@
 namespace chromeos {
 
 NetworkStateInformer::NetworkStateInformer()
-    : state_(OFFLINE),
-      weak_ptr_factory_(this) {
+    : state_(OFFLINE) {
 }
 
 NetworkStateInformer::~NetworkStateInformer() {
@@ -90,7 +88,7 @@
     check_state_.Cancel();
     check_state_.Reset(
         base::Bind(&NetworkStateInformer::UpdateStateAndNotify,
-                   weak_ptr_factory_.GetWeakPtr()));
+                   base::Unretained(this)));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         check_state_.callback(),
@@ -211,9 +209,19 @@
 bool NetworkStateInformer::IsProxyConfigured(const NetworkState* network) {
   DCHECK(network);
 
-  ProxyConfigDictionary proxy_dict(&network->proxy_config());
-  ProxyPrefs::ProxyMode mode;
-  return !proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_FIXED_SERVERS;
+  ProxyStateMap::iterator it = proxy_state_map_.find(network->guid());
+  if (it != proxy_state_map_.end() &&
+      it->second.proxy_config == network->proxy_config()) {
+    return it->second.configured;
+  }
+  net::ProxyConfig proxy_config;
+  if (!ProxyConfigServiceImpl::ParseProxyConfig(network->proxy_config(),
+                                                &proxy_config))
+    return false;
+  bool configured = !proxy_config.proxy_rules().empty();
+  proxy_state_map_[network->guid()] =
+      ProxyState(network->proxy_config(), configured);
+  return configured;
 }
 
 }  // namespace chromeos