API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier.

remoting/host/signaling_connector.cc

Index: remoting/host/signaling_connector.cc
diff --git a/remoting/host/signaling_connector.cc b/remoting/host/signaling_connector.cc
index cba384a6e31bebf814dbf556f0845bcbc7647a8e..b9706e325a5cfac87c039caafa05e13b1ca9de62 100644
--- a/remoting/host/signaling_connector.cc
+++ b/remoting/host/signaling_connector.cc
@@ -35,7 +35,7 @@ SignalingConnector::SignalingConnector(XmppSignalStrategy* signal_strategy)
     : signal_strategy_(signal_strategy),
       reconnect_attempts_(0),
       refreshing_oauth_token_(false) {
-  net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   signal_strategy_->AddListener(this);
   ScheduleTryReconnect();
@@ -43,7 +43,7 @@ SignalingConnector::SignalingConnector(XmppSignalStrategy* signal_strategy)
 
 SignalingConnector::~SignalingConnector() {
   signal_strategy_->RemoveListener(this);
-  net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
 }
 
@@ -76,9 +76,10 @@ void SignalingConnector::OnIPAddressChanged() {
   ResetAndTryReconnect();
 }
 
-void SignalingConnector::OnOnlineStateChanged(bool online) {
+void SignalingConnector::OnConnectionTypeChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(CalledOnValidThread());
-  if (online) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE) {
     LOG(INFO) << "Network state changed to online.";
     ResetAndTryReconnect();
   }
@@ -120,7 +121,9 @@ void SignalingConnector::OnNetworkError(int response_code) {
 
 void SignalingConnector::ScheduleTryReconnect() {
   DCHECK(CalledOnValidThread());
-  if (timer_.IsRunning() || net::NetworkChangeNotifier::IsOffline())
+  if (timer_.IsRunning() ||
+      net::NetworkChangeNotifier::GetConnectionType() ==
+          net::NetworkChangeNotifier::CONNECTION_NONE)

[wtc, 2012/05/11 01:35:05]

Nit: this line doesn't need to be indented.

     return;
   int delay_s = std::min(1 << (reconnect_attempts_ * 2),
                          kMaxReconnectDelaySeconds);