Add connection type to NCN::MaxBandwidthChanged

net/android/network_change_notifier_android_unittest.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.
 
 // See network_change_notifier_android.h for design explanations.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 10 matching lines @@
 
 class NetworkChangeNotifierDelegateAndroidObserver
     : public NetworkChangeNotifierDelegateAndroid::Observer {
  public:
   NetworkChangeNotifierDelegateAndroidObserver()
       : type_notifications_count_(0), max_bandwidth_notifications_count_(0) {}
 
   // 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_++;
   }
 
   int type_notifications_count() const { return type_notifications_count_; }
   int bandwidth_notifications_count() const {
     return max_bandwidth_notifications_count_;
   }
 
  private:
   int type_notifications_count_;
@@ skipping 199 matching lines @@
           &NetworkChangeNotifierObserver::notifications_count,
           base::Unretained(&connection_type_observer_)),
       base::Bind(&NetworkChangeNotifier::GetConnectionType));
   // Check that *all* the observers are notified.
   EXPECT_EQ(connection_type_observer_.notifications_count(),
             other_connection_type_observer_.notifications_count());
 }
 
 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,
        MaxBandwidthNotifiedOnConnectionChange) {
   EXPECT_EQ(0, delegate_observer_.bandwidth_notifications_count());
   SetOffline();
   EXPECT_EQ(1, delegate_observer_.bandwidth_notifications_count());
   SetOnline();
   EXPECT_EQ(2, delegate_observer_.bandwidth_notifications_count());
   SetOnline();
   EXPECT_EQ(2, delegate_observer_.bandwidth_notifications_count());
 }
 
 TEST_F(NetworkChangeNotifierAndroidTest, InitialSignal) {
   DNSChangeObserver dns_change_observer;
   NetworkChangeNotifier::AddDNSObserver(&dns_change_observer);
   base::MessageLoop::current()->Run();
   EXPECT_EQ(1, dns_change_observer.initial_notifications_count());
   EXPECT_EQ(0, dns_change_observer.change_notifications_count());
   NetworkChangeNotifier::RemoveDNSObserver(&dns_change_observer);
 }
 
 }  // namespace net