Remove NetworkStateInformer's dependency on ProxyConfigServiceImpl.

chrome/browser/ui/webui/chromeos/login/network_state_informer.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/ui/webui/chromeos/login/network_state_informer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#include "chrome/browser/prefs/proxy_config_dictionary.h"
+#include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "net/proxy/proxy_config.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
 
 // Timeout to smooth temporary network state transitions for flaky networks.
 const int kNetworkStateCheckDelaySec = 3;
 
 }  // namespace
 
 namespace chromeos {
 
 NetworkStateInformer::NetworkStateInformer()
-    : state_(OFFLINE) {
+    : state_(OFFLINE),
+      weak_ptr_factory_(this) {
 }
 
 NetworkStateInformer::~NetworkStateInformer() {
   if (NetworkHandler::IsInitialized())
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
   if (NetworkPortalDetector::IsEnabledInCommandLine() &&
       NetworkPortalDetector::GetInstance()) {
     NetworkPortalDetector::GetInstance()->RemoveObserver(this);
   }
 }
@@ skipping 44 matching lines @@
       last_online_service_path_ = new_network_service_path;
     // Transitions {OFFLINE, PORTAL} -> ONLINE and connections to
     // different network are processed without delay.
     // Transitions {OFFLINE, ONLINE} -> PORTAL in the same network are
     // also processed without delay.
     UpdateStateAndNotify();
   } else {
     check_state_.Cancel();
     check_state_.Reset(
         base::Bind(&NetworkStateInformer::UpdateStateAndNotify,
-                   base::Unretained(this)));
+                   weak_ptr_factory_.GetWeakPtr()));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         check_state_.callback(),
         base::TimeDelta::FromSeconds(kNetworkStateCheckDelaySec));
   }
 }
 
 void NetworkStateInformer::DefaultNetworkChanged(const NetworkState* network) {
   NetworkManagerChanged();
 }
@@ skipping 101 matching lines @@
       return ONLINE;
     if (network->connection_state() == flimflam::kStatePortal)
       return CAPTIVE_PORTAL;
   }
   return OFFLINE;
 }
 
 bool NetworkStateInformer::IsProxyConfigured(const NetworkState* network) {
   DCHECK(network);
 
-  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;
+  ProxyConfigDictionary proxy_dict(&network->proxy_config());
+  ProxyPrefs::ProxyMode mode;
+  return proxy_dict.GetMode(&mode) && mode == ProxyPrefs::MODE_FIXED_SERVERS;
 }
 
 }  // namespace chromeos