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

net/base/network_change_notifier.cc

Index: net/base/network_change_notifier.cc
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index ea4f96c0b8c38b4a2e225d51771cf7bf5419fcd4..7425c21b1f375efab00b6727f42e1a6cc7eb82ed 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -28,7 +28,7 @@ NetworkChangeNotifierFactory* g_network_change_notifier_factory = NULL;
 
 class MockNetworkChangeNotifier : public NetworkChangeNotifier {
  public:
-  virtual bool IsCurrentlyOffline() const { return false; }
+  virtual ConnectionState GetCurrentConnectionState() const { return ETHERNET; }
 };
 
 }  // namespace
@@ -70,9 +70,11 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
 }
 
 // static
-bool NetworkChangeNotifier::IsOffline() {
-  return g_network_change_notifier &&
-         g_network_change_notifier->IsCurrentlyOffline();
+NetworkChangeNotifier::ConnectionState
+NetworkChangeNotifier::GetConnectionState() {
+  return (g_network_change_notifier) ?
+      g_network_change_notifier->GetCurrentConnectionState() :
+      ETHERNET;
 }
 
 // static
@@ -85,10 +87,10 @@ void NetworkChangeNotifier::AddIPAddressObserver(IPAddressObserver* observer) {
     g_network_change_notifier->ip_address_observer_list_->AddObserver(observer);
 }
 
-void NetworkChangeNotifier::AddOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::AddConnectionStateObserver(
+    ConnectionStateObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->AddObserver(
+    g_network_change_notifier->connection_state_observer_list_->AddObserver(
         observer);
   }
 }
@@ -108,10 +110,10 @@ void NetworkChangeNotifier::RemoveIPAddressObserver(
   }
 }
 
-void NetworkChangeNotifier::RemoveOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::RemoveConnectionStateObserver(
+    ConnectionStateObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->RemoveObserver(
+    g_network_change_notifier->connection_state_observer_list_->RemoveObserver(
         observer);
   }
 }
@@ -127,9 +129,9 @@ NetworkChangeNotifier::NetworkChangeNotifier()
     : ip_address_observer_list_(
         new ObserverListThreadSafe<IPAddressObserver>(
             ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
-      online_state_observer_list_(
-        new ObserverListThreadSafe<OnlineStateObserver>(
-            ObserverListBase<OnlineStateObserver>::NOTIFY_EXISTING_ONLY)),
+      connection_state_observer_list_(
+        new ObserverListThreadSafe<ConnectionStateObserver>(
+            ObserverListBase<ConnectionStateObserver>::NOTIFY_EXISTING_ONLY)),
       resolver_state_observer_list_(
         new ObserverListThreadSafe<DNSObserver>(
             ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)) {
@@ -151,10 +153,11 @@ void NetworkChangeNotifier::NotifyObserversOfDNSChange() {
   }
 }
 
-void NetworkChangeNotifier::NotifyObserversOfOnlineStateChange() {
+void NetworkChangeNotifier::NotifyObserversOfConnectionStateChange() {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->Notify(
-        &OnlineStateObserver::OnOnlineStateChanged, !IsOffline());
+    g_network_change_notifier->connection_state_observer_list_->Notify(
+        &ConnectionStateObserver::OnConnectionStateChanged,
+        GetConnectionState());
   }
 }