Remove NetworkStateInformer's dependency on ProxyConfigServiceImpl.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_STATE_INFORMER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_STATE_INFORMER_H_
 
 #include <map>
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
@@ skipping 63 matching lines @@
   }
 
   bool is_online() { return state_ == ONLINE; }
   State state() const { return state_; }
   std::string last_network_service_path() const {
     return last_network_service_path_;
   }
   std::string last_network_type() const { return last_network_type_; }
 
  private:
-  struct ProxyState {
-    ProxyState() : configured(false) {
-    }
-
-    ProxyState(const std::string& proxy_config, bool configured)
-        : proxy_config(proxy_config),
-          configured(configured) {
-    }
-
-    std::string proxy_config;
-    bool configured;
-  };
-
-  typedef std::map<std::string, ProxyState> ProxyStateMap;
-
   friend class base::RefCounted<NetworkStateInformer>;
 
   virtual ~NetworkStateInformer();
 
   bool UpdateState();
 
   void UpdateStateAndNotify();
 
   void SendStateToObservers(ErrorScreenActor::ErrorReason reason);
 
   State GetNetworkState(const NetworkState* network);
   bool IsProxyConfigured(const NetworkState* network);
 
   content::NotificationRegistrar registrar_;
   State state_;
   ObserverList<NetworkStateInformerObserver> observers_;
   std::string last_online_service_path_;
   std::string last_connected_service_path_;
   std::string last_network_service_path_;
   std::string last_network_type_;
   base::CancelableClosure check_state_;
 
-  // Caches proxy state for active networks.
-  ProxyStateMap proxy_state_map_;
+  base::WeakPtrFactory<NetworkStateInformer> weak_ptr_factory_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_STATE_INFORMER_H_