Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

remoting/host/signaling_connector.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 "remoting/host/signaling_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "google_apis/google_api_keys.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 26 matching lines @@
     scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker,
     const base::Closure& auth_failed_callback)
     : signal_strategy_(signal_strategy),
       url_request_context_getter_(url_request_context_getter),
       auth_failed_callback_(auth_failed_callback),
       dns_blackhole_checker_(dns_blackhole_checker.Pass()),
       reconnect_attempts_(0),
       refreshing_oauth_token_(false) {
   DCHECK(!auth_failed_callback_.is_null());
   DCHECK(dns_blackhole_checker_.get());
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   signal_strategy_->AddListener(this);
   ScheduleTryReconnect();
 }
 
 SignalingConnector::~SignalingConnector() {
   signal_strategy_->RemoveListener(this);
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void SignalingConnector::EnableOAuth(
     scoped_ptr<OAuthCredentials> oauth_credentials) {
   oauth_credentials_ = oauth_credentials.Pass();
   gaia_oauth_client_.reset(new gaia::GaiaOAuthClient(
       gaia::kGaiaOAuth2Url, url_request_context_getter_));
 }
 
 void SignalingConnector::OnSignalStrategyStateChange(
@@ skipping 15 matching lines @@
       ScheduleTryReconnect();
     }
   }
 }
 
 bool SignalingConnector::OnSignalStrategyIncomingStanza(
     const buzz::XmlElement* stanza) {
   return false;
 }
 
-void SignalingConnector::OnConnectionTypeChanged(
+void SignalingConnector::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(CalledOnValidThread());
   if (type != net::NetworkChangeNotifier::CONNECTION_NONE) {
     LOG(INFO) << "Network state changed to online.";
     ResetAndTryReconnect();
   }
 }
 
-void SignalingConnector::OnIPAddressChanged() {
-  DCHECK(CalledOnValidThread());
-  LOG(INFO) << "IP address has changed.";
-  ResetAndTryReconnect();
-}
-
 void SignalingConnector::OnGetTokensResponse(const std::string& user_email,
                                              const std::string& access_token,
                                              int expires_seconds) {
   NOTREACHED();
 }
 
 void SignalingConnector::OnRefreshTokenResponse(
     const std::string& access_token,
     int expires_seconds) {
   DCHECK(CalledOnValidThread());
@@ skipping 115 matching lines @@
       // is not required when getting access tokens.
       ""
   };
 
   refreshing_oauth_token_ = true;
   gaia_oauth_client_->RefreshToken(
       client_info, oauth_credentials_->refresh_token, 1, this);
 }
 
 }  // namespace remoting