Add connection type to NCN::MaxBandwidthChanged

net/android/network_change_notifier_android_unittest.cc

Index: net/android/network_change_notifier_android_unittest.cc
diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
index 933e0a3524740d5de7a5e3038a40b3ece85f581a..1f2c04f856374a253d88c372a694a1a797dec086 100644
--- a/net/android/network_change_notifier_android_unittest.cc
+++ b/net/android/network_change_notifier_android_unittest.cc
@@ -28,7 +28,8 @@ class NetworkChangeNotifierDelegateAndroidObserver
   // NetworkChangeNotifierDelegateAndroid::Observer:
   void OnConnectionTypeChanged() override { type_notifications_count_++; }
 
-  void OnMaxBandwidthChanged(double max_bandwidth_mbps) override {
+  void OnMaxBandwidthChanged(net::NetworkChangeNotifier::ConnectionType type,
+                             double max_bandwidth_mbps) override {
     max_bandwidth_notifications_count_++;
   }
 
@@ -248,14 +249,18 @@ TEST_F(NetworkChangeNotifierAndroidTest,
 
 TEST_F(NetworkChangeNotifierAndroidTest, MaxBandwidth) {
   SetOnline();
-  EXPECT_EQ(NetworkChangeNotifier::CONNECTION_UNKNOWN,
-            notifier_->GetConnectionType());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(),
-            notifier_->GetMaxBandwidth());
+  double max_bandwidth_mbps = 0.0;
+  NetworkChangeNotifier::ConnectionType connection_type =
+      NetworkChangeNotifier::CONNECTION_NONE;
+  notifier_->GetMaxBandwidthAndConnectionType(&max_bandwidth_mbps,
+                                              &connection_type);
+  EXPECT_EQ(NetworkChangeNotifier::CONNECTION_UNKNOWN, connection_type);
+  EXPECT_EQ(std::numeric_limits<double>::infinity(), max_bandwidth_mbps);
   SetOffline();
-  EXPECT_EQ(NetworkChangeNotifier::CONNECTION_NONE,
-            notifier_->GetConnectionType());
-  EXPECT_EQ(0.0, notifier_->GetMaxBandwidth());
+  notifier_->GetMaxBandwidthAndConnectionType(&max_bandwidth_mbps,
+                                              &connection_type);
+  EXPECT_EQ(NetworkChangeNotifier::CONNECTION_NONE, connection_type);
+  EXPECT_EQ(0.0, max_bandwidth_mbps);
 }
 
 TEST_F(NetworkChangeNotifierDelegateAndroidTest,