Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/common/net/notifier/communicator/login.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_
 #define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_
 
 #include <string>
 
 #include "base/time.h"
 #include "base/timer.h"
@@ skipping 37 matching lines @@
               public sigslot::has_slots<> {
  public:
   // network_status and firewall may be NULL.
   Login(talk_base::TaskParent* parent,
         const buzz::XmppClientSettings& user_settings,
         const ConnectionOptions& options,
         std::string lang,
         net::HostResolver* host_resolver,
         ServerInformation* server_list,
         int server_count,
-        net::NetworkChangeNotifier* network_change_notifier,
         talk_base::FirewallManager* firewall,
         bool proxy_only,
         bool previous_login_successful);
   virtual ~Login();
 
   LoginConnectionState connection_state() const {
     return state_;
   }
 
   void StartConnection();
@@ skipping 49 matching lines @@
   void OnLogoff();
   void OnAutoReconnectTimerChange();
 
   void HandleClientStateChange(LoginConnectionState new_state);
   void ResetUnexpectedDisconnect();
 
   void OnDisconnectTimeout();
 
   talk_base::TaskParent* parent_;
   scoped_ptr<LoginSettings> login_settings_;
-  net::NetworkChangeNotifier* network_change_notifier_;
   AutoReconnect auto_reconnect_;
   SingleLoginAttempt* single_attempt_;
   bool successful_connection_;
 
   LoginConnectionState state_;
 
   // server redirect information
   base::Time redirect_time_;
   std::string redirect_server_;
   int redirect_port_;
   bool unexpected_disconnect_occurred_;
   base::OneShotTimer<Login> reset_unexpected_timer_;
   std::string google_host_;
   std::string google_user_;
   talk_base::ProxyInfo proxy_info_;
 
   base::OneShotTimer<Login> disconnect_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 }  // namespace notifier
 
 #endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_