Provide NetworkChangeNotifierAndroid with the actual initial connection type.

net/android/network_change_notifier_android.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.
 
 ////////////////////////////////////////////////////////////////////////////////
 // Threading considerations:
 //
 // This class is designed to meet various threading guarantees starting from the
 // ones imposed by NetworkChangeNotifier:
 // - The notifier can be constructed on any thread.
@@ skipping 49 matching lines @@
 #include "net/android/network_change_notifier_android.h"
 
 namespace net {
 
 NetworkChangeNotifierAndroid::~NetworkChangeNotifierAndroid() {
   delegate_->RemoveObserver(this);
 }
 
 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);
   NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
   NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange();
 }
 
 // static
 bool NetworkChangeNotifierAndroid::Register(JNIEnv* env) {
   return NetworkChangeNotifierDelegateAndroid::Register(env);
 }
 
 NetworkChangeNotifierAndroid::NetworkChangeNotifierAndroid(
     NetworkChangeNotifierDelegateAndroid* delegate)
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsAndroid()),
       delegate_(delegate) {
-  SetConnectionType(NetworkChangeNotifier::CONNECTION_UNKNOWN);
   delegate_->AddObserver(this);
 }
 
 // static
 NetworkChangeNotifier::NetworkChangeCalculatorParams
 NetworkChangeNotifierAndroid::NetworkChangeCalculatorParamsAndroid() {
   NetworkChangeCalculatorParams params;
   // IPAddressChanged is produced immediately prior to ConnectionTypeChanged
   // so delay IPAddressChanged so they get merged with the following
   // ConnectionTypeChanged signal.
   params.ip_address_offline_delay_ = base::TimeDelta::FromSeconds(1);
   params.ip_address_online_delay_ = base::TimeDelta::FromSeconds(1);
   params.connection_type_offline_delay_ = base::TimeDelta::FromSeconds(0);
   params.connection_type_online_delay_ = base::TimeDelta::FromSeconds(0);
   return params;
 }
 
-void NetworkChangeNotifierAndroid::SetConnectionType(
-    ConnectionType new_connection_type) {
-  base::AutoLock auto_lock(connection_type_lock_);
-  connection_type_ = new_connection_type;
-}
-
 }  // namespace net