Index: net/android/network_change_notifier_android.cc |
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc |
index 6dce66981fbd921bc2d1bedbae3e26b73becd735..d4e1a5c8524f6975fd028b3f8b4cbab87cdc5d8c 100644 |
--- a/net/android/network_change_notifier_android.cc |
+++ b/net/android/network_change_notifier_android.cc |
@@ -67,13 +67,10 @@ NetworkChangeNotifierAndroid::~NetworkChangeNotifierAndroid() { |
NetworkChangeNotifier::ConnectionType |
NetworkChangeNotifierAndroid::GetCurrentConnectionType() const { |
- base::AutoLock auto_lock(connection_type_lock_); |
- return connection_type_; |
+ return delegate_->GetCurrentConnectionType(); |
} |
-void NetworkChangeNotifierAndroid::OnConnectionTypeChanged( |
- ConnectionType new_connection_type) { |
- SetConnectionType(new_connection_type); |
+void NetworkChangeNotifierAndroid::OnConnectionTypeChanged() { |
NetworkChangeNotifier::NotifyObserversOfIPAddressChange(); |
NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange(); |
} |
@@ -87,7 +84,6 @@ NetworkChangeNotifierAndroid::NetworkChangeNotifierAndroid( |
NetworkChangeNotifierDelegateAndroid* delegate) |
: NetworkChangeNotifier(NetworkChangeCalculatorParamsAndroid()), |
delegate_(delegate) { |
- SetConnectionType(NetworkChangeNotifier::CONNECTION_UNKNOWN); |
delegate_->AddObserver(this); |
} |
@@ -105,10 +101,4 @@ NetworkChangeNotifierAndroid::NetworkChangeCalculatorParamsAndroid() { |
return params; |
} |
-void NetworkChangeNotifierAndroid::SetConnectionType( |
- ConnectionType new_connection_type) { |
- base::AutoLock auto_lock(connection_type_lock_); |
- connection_type_ = new_connection_type; |
-} |
- |
} // namespace net |