Massively simplify the NetworkChangeNotifier infrastructure:...

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

-// 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.
 
 #include <string>
 
 #include "chrome/common/net/notifier/communicator/login.h"
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "chrome/common/net/notifier/communicator/auto_reconnect.h"
 #include "chrome/common/net/notifier/communicator/connection_options.h"
 #include "chrome/common/net/notifier/communicator/login_settings.h"
 #include "chrome/common/net/notifier/communicator/product_info.h"
 #include "chrome/common/net/notifier/communicator/single_login_attempt.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/network_change_notifier.h"
 #include "talk/base/common.h"
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/logging.h"
 #include "talk/base/physicalsocketserver.h"
 #include "talk/base/taskrunner.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/asyncsocket.h"
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/xmppclient.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "talk/xmpp/xmppengine.h"
 
 namespace notifier {
 
 // Redirect valid for 5 minutes.
 static const int kRedirectTimeoutMinutes = 5;
 
 // Disconnect if network stays down for more than 10 seconds.
 static const int kDisconnectionDelaySecs = 10;
 
 Login::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)
     : parent_(parent),
       login_settings_(new LoginSettings(user_settings,
                                         options,
                                         lang,
                                         host_resolver,
                                         server_list,
                                         server_count,
                                         firewall,
                                         proxy_only)),
-      network_change_notifier_(network_change_notifier),
       single_attempt_(NULL),
       successful_connection_(previous_login_successful),
       state_(STATE_OPENING),
       redirect_port_(0),
       unexpected_disconnect_occurred_(false),
       google_host_(user_settings.host()),
       google_user_(user_settings.user()) {
-  DCHECK(network_change_notifier_);
   // Hook up all the signals and observers.
-  network_change_notifier_->AddObserver(this);
+  net::NetworkChangeNotifier::AddObserver(this);
   auto_reconnect_.SignalStartConnection.connect(this,
                                                 &Login::StartConnection);
   auto_reconnect_.SignalTimerStartStop.connect(
       this,
       &Login::OnAutoReconnectTimerChange);
   SignalClientStateChange.connect(&auto_reconnect_,
                                   &AutoReconnect::OnClientStateChange);
   SignalIdleChange.connect(&auto_reconnect_,
                            &AutoReconnect::set_idle);
   SignalPowerSuspended.connect(&auto_reconnect_,
                                &AutoReconnect::OnPowerSuspend);
 
   // Then check the initial state of the connection.
   CheckConnection();
 }
 
 // Defined so that the destructors are executed here (and the corresponding
 // classes don't need to be included in the header file).
 Login::~Login() {
   if (single_attempt_) {
     single_attempt_->Abort();
     single_attempt_ = NULL;
   }
-  network_change_notifier_->RemoveObserver(this);
+  net::NetworkChangeNotifier::RemoveObserver(this);
 }
 
 void Login::StartConnection() {
   // If there is a server redirect, use it.
   if (base::Time::Now() <
       (redirect_time_ +
        base::TimeDelta::FromMinutes(kRedirectTimeoutMinutes))) {
     // Override server/port with redirect values.
     DCHECK_NE(redirect_port_, 0);
     net::HostPortPair server_override(redirect_server_, redirect_port_);
@@ skipping 236 matching lines @@
 
   if (single_attempt_) {
     single_attempt_->Abort();
     single_attempt_ = NULL;
   }
 
   StartConnection();
 }
 
 }  // namespace notifier