NQE: Do not record correlation if metric is missing

net/nqe/network_quality_estimator.cc

Index: net/nqe/network_quality_estimator.cc
diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc
index cf364b5fe13f64a5badffc7d4bc6edd048aed4cd..6332d6b036d339076c31c4b137201cbb5c27aa9e 100644
--- a/net/nqe/network_quality_estimator.cc
+++ b/net/nqe/network_quality_estimator.cc
@@ -626,32 +626,36 @@ void NetworkQualityEstimator::RecordCorrelationMetric(const URLRequest& request,
   if (now - last_main_frame_request_ > base::TimeDelta::FromSeconds(15))
     return;
 
+  if (last_connection_change_ >= last_main_frame_request_)
+    return;
+
   DCHECK_GE(now, load_timing_info.send_start);
 
   int32_t rtt = 0;
 
   if (UseTransportRTT()) {
-    rtt = estimated_quality_at_last_main_frame_.transport_rtt() !=
-                  nqe::internal::InvalidRTT()
-              ? FitInKBitsPerMetricBits(
-                    estimated_quality_at_last_main_frame_.transport_rtt()
-                        .InMilliseconds())
-              : 0;
+    if (estimated_quality_at_last_main_frame_.transport_rtt() ==
+        nqe::internal::InvalidRTT()) {
+      return;
+    }
+    rtt = FitInKBitsPerMetricBits(
+        estimated_quality_at_last_main_frame_.transport_rtt().InMilliseconds());
   } else {
-    rtt = estimated_quality_at_last_main_frame_.http_rtt() !=
-                  nqe::internal::InvalidRTT()
-              ? FitInKBitsPerMetricBits(
-                    estimated_quality_at_last_main_frame_.http_rtt()
-                        .InMilliseconds())
-              : 0;
+    if (estimated_quality_at_last_main_frame_.http_rtt() ==
+        nqe::internal::InvalidRTT()) {
+      return;
+    }
+    rtt = FitInKBitsPerMetricBits(
+        estimated_quality_at_last_main_frame_.http_rtt().InMilliseconds());
   }
 
-  const int32_t downstream_throughput =
-      estimated_quality_at_last_main_frame_.downstream_throughput_kbps() !=
-              nqe::internal::kInvalidThroughput
-          ? FitInKBitsPerMetricBits(estimated_quality_at_last_main_frame_
-                                        .downstream_throughput_kbps())
-          : 0;
+  if (estimated_quality_at_last_main_frame_.downstream_throughput_kbps() ==

[RyanSturm, 2017/02/02 23:06:16]

Move this if above the UseTrasportRTT block so that we don't need to run all the
extra code like FitInKBitsPerMetricsBits. Keep lines 657 and 658 below where
they are though.

[tbansal1, 2017/02/03 00:56:26]

Done.

+      nqe::internal::kInvalidThroughput) {
+    return;
+  }
+
+  const int32_t downstream_throughput = FitInKBitsPerMetricBits(
+      estimated_quality_at_last_main_frame_.downstream_throughput_kbps());
 
   const int32_t resource_load_time = FitInKBitsPerMetricBits(
       (now - load_timing_info.send_start).InMilliseconds());