BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 51 insertions, 41 deletions

diff --git a/chromium/net/nqe/network_quality_estimator_test_util.cc b/chromium/net/nqe/network_quality_estimator_test_util.cc
index 5a99a54f83c..f2e4545da3d 100644
--- a/chromium/net/nqe/network_quality_estimator_test_util.cc
+++ b/chromium/net/nqe/network_quality_estimator_test_util.cc
@@ -135,60 +135,72 @@ TestNetworkQualityEstimator::GetRecentEffectiveConnectionTypeAndNetworkQuality(
     const base::TimeTicks& start_time,
     base::TimeDelta* http_rtt,
     base::TimeDelta* transport_rtt,
+    base::TimeDelta* end_to_end_rtt,
     int32_t* downstream_throughput_kbps,
     size_t* observations_count) const {
   if (recent_effective_connection_type_) {
-    GetRecentHttpRTT(start_time, http_rtt);
-    GetRecentTransportRTT(start_time, transport_rtt, observations_count);
+    GetRecentRTT(nqe::internal::OBSERVATION_CATEGORY_HTTP, start_time, http_rtt,
+                 nullptr);
+    GetRecentRTT(nqe::internal::OBSERVATION_CATEGORY_TRANSPORT, start_time,
+                 transport_rtt, observations_count);
     GetRecentDownlinkThroughputKbps(start_time, downstream_throughput_kbps);
     return recent_effective_connection_type_.value();
   }
   return NetworkQualityEstimator::
       GetRecentEffectiveConnectionTypeAndNetworkQuality(
-          start_time, http_rtt, transport_rtt, downstream_throughput_kbps,
-          observations_count);
+          start_time, http_rtt, transport_rtt, end_to_end_rtt,
+          downstream_throughput_kbps, observations_count);
 }
 
-bool TestNetworkQualityEstimator::GetRecentHttpRTT(
-    const base::TimeTicks& start_time,
-    base::TimeDelta* rtt) const {
-  if (start_time.is_null()) {
-    if (start_time_null_http_rtt_) {
-      *rtt = start_time_null_http_rtt_.value();
-      return true;
-    }
-    return NetworkQualityEstimator::GetRecentHttpRTT(start_time, rtt);
-  }
-  if (recent_http_rtt_) {
-    *rtt = recent_http_rtt_.value();
-    return true;
-  }
-  return NetworkQualityEstimator::GetRecentHttpRTT(start_time, rtt);
-}
-
-bool TestNetworkQualityEstimator::GetRecentTransportRTT(
+bool TestNetworkQualityEstimator::GetRecentRTT(
+    nqe::internal::ObservationCategory observation_category,
     const base::TimeTicks& start_time,
     base::TimeDelta* rtt,
     size_t* observations_count) const {
-  if (start_time.is_null()) {
-    if (start_time_null_transport_rtt_) {
-      *rtt = start_time_null_transport_rtt_.value();
-      if (transport_rtt_observation_count_last_ect_computation_) {
-        *observations_count =
-            transport_rtt_observation_count_last_ect_computation_.value();
+  switch (observation_category) {
+    case nqe::internal::OBSERVATION_CATEGORY_HTTP:
+
+      if (start_time.is_null()) {
+        if (start_time_null_http_rtt_) {
+          *rtt = start_time_null_http_rtt_.value();
+          return true;
+        }
+        return NetworkQualityEstimator::GetRecentRTT(
+            observation_category, start_time, rtt, observations_count);
+      }
+      if (recent_http_rtt_) {
+        *rtt = recent_http_rtt_.value();
+        return true;
+      }
+      break;
+
+    case nqe::internal::OBSERVATION_CATEGORY_TRANSPORT:
+      if (start_time.is_null()) {
+        if (start_time_null_transport_rtt_) {
+          *rtt = start_time_null_transport_rtt_.value();
+          if (transport_rtt_observation_count_last_ect_computation_) {
+            *observations_count =
+                transport_rtt_observation_count_last_ect_computation_.value();
+          }
+          return true;
+        }
+        return NetworkQualityEstimator::GetRecentRTT(
+            observation_category, start_time, rtt, observations_count);
       }
-      return true;
-    }
-    return NetworkQualityEstimator::GetRecentTransportRTT(start_time, rtt,
-                                                          observations_count);
-  }
 
-  if (recent_transport_rtt_) {
-    *rtt = recent_transport_rtt_.value();
-    return true;
+      if (recent_transport_rtt_) {
+        *rtt = recent_transport_rtt_.value();
+        return true;
+      }
+      break;
+    case nqe::internal::OBSERVATION_CATEGORY_END_TO_END:
+      break;
+    case nqe::internal::OBSERVATION_CATEGORY_COUNT:
+      NOTREACHED();
   }
-  return NetworkQualityEstimator::GetRecentTransportRTT(start_time, rtt,
-                                                        observations_count);
+
+  return NetworkQualityEstimator::GetRecentRTT(observation_category, start_time,
+                                               rtt, observations_count);
 }
 
 base::Optional<base::TimeDelta> TestNetworkQualityEstimator::GetTransportRTT()
@@ -220,7 +232,6 @@ bool TestNetworkQualityEstimator::GetRecentDownlinkThroughputKbps(
 
 base::TimeDelta TestNetworkQualityEstimator::GetRTTEstimateInternal(
     base::TimeTicks start_time,
-    const base::Optional<NetworkQualityEstimator::Statistic>& statistic,
     nqe::internal::ObservationCategory observation_category,
     int percentile,
     size_t* observations_count) const {
@@ -228,8 +239,7 @@ base::TimeDelta TestNetworkQualityEstimator::GetRTTEstimateInternal(
     return rtt_estimate_internal_.value();
 
   return NetworkQualityEstimator::GetRTTEstimateInternal(
-      start_time, statistic, observation_category, percentile,
-      observations_count);
+      start_time, observation_category, percentile, observations_count);
 }
 
 void TestNetworkQualityEstimator::SetAccuracyRecordingIntervals(