Job Controller: clean up metrics logging about the job racing result

net/http/http_server_properties.cc

Index: net/http/http_server_properties.cc
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index a1a7ed61ecb56033390b15747744f13427c448a9..997b681e7ada26a6fb71ba22a54dbffcfdb968ad 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -14,9 +14,31 @@ namespace net {
 
 const char kAlternativeServiceHeader[] = "Alt-Svc";
 
-void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
-  UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
-                            ALTERNATE_PROTOCOL_USAGE_MAX);
+AlternativeProxyUsage ConvertProtocolUsageToProxyUsage(
+    AlternateProtocolUsage usage) {
+  switch (usage) {
+    case ALTERNATE_PROTOCOL_USAGE_NO_RACE:
+      return ALTERNATIVE_PROXY_USAGE_NO_RACE;
+    case ALTERNATE_PROTOCOL_USAGE_WON_RACE:
+      return ALTERNATIVE_PROXY_USAGE_WON_RACE;
+    case ALTERNATE_PROTOCOL_USAGE_LOST_RACE:
+      return ALTERNATIVE_PROXY_USAGE_LOST_RACE;
+    default:

[tbansal1, 2016/09/22 17:53:02]

Add NOTREACHED() in default: so an error is triggered immediately in debug
builds.

[Zhongyi Shi, 2016/09/22 23:56:53]

Done.

+      return ALTERNATIVE_PROXY_USAGE_MAX;
+  }
+}
+
+void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage,
+                                     bool proxy_server_used) {
+  if (proxy_server_used) {
+    DCHECK_LE(usage, ALTERNATE_PROTOCOL_USAGE_LOST_RACE);
+    UMA_HISTOGRAM_ENUMERATION("Net.QuicAlternativeProxy.Usage",
+                              ConvertProtocolUsageToProxyUsage(usage),
+                              ALTERNATIVE_PROXY_USAGE_MAX);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
+                              ALTERNATE_PROTOCOL_USAGE_MAX);
+  }
 }
 
 void HistogramBrokenAlternateProtocolLocation(