Add connection type to NCN::MaxBandwidthChanged

net/android/network_change_notifier_delegate_android.h

 // 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.
 
 #ifndef NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 17 matching lines @@
   // subscribes to network change notifications fired by the delegate (and
   // initiated by the Java side).
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Updates the current connection type.
     virtual void OnConnectionTypeChanged() = 0;
 
     // Updates the current max bandwidth.
-    virtual void OnMaxBandwidthChanged(double max_bandwidth_mbps) = 0;
+    virtual void OnMaxBandwidthChanged(ConnectionType connection_type,
+                                       double max_bandwidth_mbps) = 0;
   };
 
   NetworkChangeNotifierDelegateAndroid();
   ~NetworkChangeNotifierDelegateAndroid();
 
   // Called from NetworkChangeNotifierAndroid.java on the JNI thread whenever
   // the connection type changes. This updates the current connection type seen
   // by this class and forwards the notification to the observers that
   // subscribed through AddObserver().
   void NotifyConnectionTypeChanged(JNIEnv* env,
@@ skipping 11 matching lines @@
 
   // These methods can be called on any thread. Note that the provided observer
   // will be notified on the thread AddObserver() is called on.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Can be called from any thread.
   ConnectionType GetCurrentConnectionType() const;
 
   // Can be called from any thread.
-  double GetCurrentMaxBandwidth() const;
+  double GetCurrentMaxBandwidthAndConnectionType(
+      ConnectionType* connection_type) const;
 
   // Initializes JNI bindings.
   static bool Register(JNIEnv* env);
 
  private:
   friend class BaseNetworkChangeNotifierAndroidTest;
 
   void SetCurrentConnectionType(ConnectionType connection_type);
   void SetCurrentMaxBandwidth(double max_bandwidth);
 
   // Methods calling the Java side exposed for testing.
   void SetOnline();
   void SetOffline();
 
   base::ThreadChecker thread_checker_;
   scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
   scoped_refptr<base::SingleThreadTaskRunner> jni_task_runner_;
   base::android::ScopedJavaGlobalRef<jobject> java_network_change_notifier_;
   mutable base::Lock connection_lock_;  // Protects the state below.
   ConnectionType connection_type_;
   double connection_max_bandwidth_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierDelegateAndroid);
 };
 
 }  // namespace net
 
 #endif  // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_H_