Separate out observation sources as either HTTP layer or transport layer

net/nqe/network_quality_observation_source.h

Index: net/nqe/network_quality_observation_source.h
diff --git a/net/nqe/network_quality_observation_source.h b/net/nqe/network_quality_observation_source.h
index c1614027f277a84d25946ef31ca073e51bb0e528..395a90a25113748fbcb1e46a78537cafe86a29f5 100644
--- a/net/nqe/network_quality_observation_source.h
+++ b/net/nqe/network_quality_observation_source.h
@@ -15,24 +15,57 @@ enum NetworkQualityObservationSource {
   // The observation was taken at the request layer, e.g., a round trip time
   // is recorded as the time between the request being sent and the first byte
   // being received.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_URL_REQUEST = 0,
+  NETWORK_QUALITY_OBSERVATION_SOURCE_HTTP = 0,
 
   // The observation is taken from TCP statistics maintained by the kernel.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_TCP,
+  // This source is depecated and should not be used.
+  //  DEPRECATED_NETWORK_QUALITY_OBSERVATION_SOURCE_TCP = 1,

[bengr, 2016/11/04 16:38:13]

Why not just rename this as TRANSPORT? In general, why all the deprecation? 

[tbansal1, 2016/11/04 20:11:20]

I can do this. I just wanted to avoid confusion of using the same enum value for
2 different things (TCP vs. TCP+QUIC).
I would still need to deprecate other enums because they (e.g.,
NETWORK_QUALITY_OBSERVATION_SOURCE_CACHED_ESTIMATE,
NETWORK_QUALITY_OBSERVATION_SOURCE_DEFAULT_FROM_PLATFORM)  have been split into
2 (one for HTTP, one for transport).

 
   // The observation is taken at the QUIC layer.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC,
+  // This source is depecated and should not be used.
+  // DEPRECATED_NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC = 2,
 
   // The observation is a previously cached estimate of the metric.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_CACHED_ESTIMATE,
+  // This source is depecated and should not be used.
+  // DEPRECATED_NETWORK_QUALITY_OBSERVATION_SOURCE_CACHED_ESTIMATE = 3,
 
   // The observation is derived from network connection information provided
   // by the platform. For example, typical RTT and throughput values are used
   // for a given type of network connection.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_DEFAULT_FROM_PLATFORM,
+  // This source is depecated and should not be used.
+  // DEPRECATED_NETWORK_QUALITY_OBSERVATION_SOURCE_DEFAULT_FROM_PLATFORM = 4,
 
   // The observation came from a Chromium-external source.
-  NETWORK_QUALITY_OBSERVATION_SOURCE_EXTERNAL_ESTIMATE,
+  // This source is depecated and should not be used.
+  // DEPRECATED_NETWORK_QUALITY_OBSERVATION_SOURCE_EXTERNAL_ESTIMATE = 5,
+
+  // The observation was taken at the transport layer from the UDP sockets (when
+  // using QUIC), or from the TCP sockets.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_TRANSPORT = 6,
+
+  // The observation is a previously cached estimate of the metric. The metric
+  // was computed at the HTTP layer.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_HTTP_CACHED_ESTIMATE = 7,
+
+  // The observation is a previously cached estimate of the metric. The metric
+  // was computed at the transport layer.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_TRANSPORT_CACHED_ESTIMATE = 8,
+
+  // The observation is derived from the network connection information provided
+  // by the platform. For example, typical RTT and throughput values are used
+  // for a given type of network connection.  The metric was provided for use
+  // at the HTTP layer.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_DEFAULT_HTTP_FROM_PLATFORM = 9,
+
+  // The observation is derived from the network connection information provided
+  // by the platform. For example, typical RTT and throughput values are used
+  // for a given type of network connection.  The metric was provided for use
+  // at the transport layer.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_DEFAULT_TRANSPORT_FROM_PLATFORM = 10,
+
+  // The observation came from a Chromium-external source. The metric was
+  // computed by the external source at the HTTP layer.
+  NETWORK_QUALITY_OBSERVATION_SOURCE_HTTP_EXTERNAL_ESTIMATE = 11,
 
   NETWORK_QUALITY_OBSERVATION_SOURCE_MAX,
 };