Add effective connection type to throughput mapping

net/nqe/network_quality_estimator_unittest.cc

 // Copyright 2015 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.
 
 #include "net/nqe/network_quality_estimator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 2692 matching lines @@
   histogram_tester.ExpectUniqueSample("NQE.Prefs.ReadSize", read_prefs.size(),
                                       1);
 
   // Taken from network_quality_estimator_params.cc.
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(1800),
             rtt_observer.last_rtt(
                 NETWORK_QUALITY_OBSERVATION_SOURCE_HTTP_CACHED_ESTIMATE));
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(1500),
             rtt_observer.last_rtt(
                 NETWORK_QUALITY_OBSERVATION_SOURCE_TRANSPORT_CACHED_ESTIMATE));
-  EXPECT_EQ(0u, throughput_observer.observations().size());
+  EXPECT_EQ(1u, throughput_observer.observations().size());
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(1800),
             rtt_throughput_observer.http_rtt());
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(1500),
             rtt_throughput_observer.transport_rtt());
-  EXPECT_EQ(nqe::internal::kInvalidThroughput,
-            rtt_throughput_observer.downstream_throughput_kbps());
+  EXPECT_EQ(75, rtt_throughput_observer.downstream_throughput_kbps());
   EXPECT_LE(
       1u,
       effective_connection_type_observer.effective_connection_types().size());
   // Compare the ECT stored in prefs with the observer's last entry.
   EXPECT_EQ(
       read_prefs[nqe::internal::NetworkID(
                      NetworkChangeNotifier::CONNECTION_WIFI, network_name)]
           .effective_connection_type(),
       effective_connection_type_observer.effective_connection_types().back());
 
   // Change to a different connection type.
   network_name = "test_ect_slow_2g";
   estimator.SimulateNetworkChange(
       NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI, network_name);
 
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(3600),
             rtt_observer.last_rtt(
                 NETWORK_QUALITY_OBSERVATION_SOURCE_HTTP_CACHED_ESTIMATE));
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(3000),
             rtt_observer.last_rtt(
                 NETWORK_QUALITY_OBSERVATION_SOURCE_TRANSPORT_CACHED_ESTIMATE));
-  EXPECT_EQ(0u, throughput_observer.observations().size());
+  EXPECT_EQ(2U, throughput_observer.observations().size());
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(3600),
             rtt_throughput_observer.http_rtt());
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(3000),
             rtt_throughput_observer.transport_rtt());
-  EXPECT_EQ(nqe::internal::kInvalidThroughput,
-            rtt_throughput_observer.downstream_throughput_kbps());
+  EXPECT_EQ(40, rtt_throughput_observer.downstream_throughput_kbps());
   EXPECT_LE(
       2u,
       effective_connection_type_observer.effective_connection_types().size());
   // Compare with the last entry.
   EXPECT_EQ(
       read_prefs[nqe::internal::NetworkID(
                      NetworkChangeNotifier::CONNECTION_WIFI, network_name)]
           .effective_connection_type(),
       effective_connection_type_observer.effective_connection_types().back());
 
   // Cleanup.
   estimator.RemoveRTTObserver(&rtt_observer);
   estimator.RemoveThroughputObserver(&throughput_observer);
   estimator.RemoveRTTAndThroughputEstimatesObserver(&rtt_throughput_observer);
   estimator.RemoveEffectiveConnectionTypeObserver(
       &effective_connection_type_observer);
 }
 
 }  // namespace net