Fixing histogram logging to better track variations headers https change.

components/variations/net/variations_http_headers.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 "components/variations/net/variations_http_headers.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 30 matching lines @@
 const char kClientData[] = "X-Client-Data";
 
 // The result of checking if a URL should have variations headers appended.
 // This enum is used to record UMA histogram values, and should not be
 // reordered.
 enum URLValidationResult {
   INVALID_URL,
   NOT_HTTPS,
   NOT_GOOGLE_DOMAIN,
   SHOULD_APPEND,
+  NEITHER_HTTP_HTTPS,
+  IS_GOOGLE_NOT_HTTPS,
   URL_VALIDATION_RESULT_SIZE,
 };
 
 // Checks whether headers should be appended to the |url|, based on the domain
-// of |url|. |url| is assumed to be valid, and to have the https scheme.
+// of |url|. |url| is assumed to be valid, and to have an http/https scheme.
 bool IsGoogleDomain(const GURL& url) {
   if (google_util::IsGoogleDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                      google_util::ALLOW_NON_STANDARD_PORTS)) {
     return true;
   }
   if (google_util::IsYoutubeDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                       google_util::ALLOW_NON_STANDARD_PORTS)) {
     return true;
   }
 
@@ skipping 58 matching lines @@
 }
 
 namespace internal {
 
 // static
 bool ShouldAppendVariationHeaders(const GURL& url) {
   if (!url.is_valid()) {
     LogUrlValidationHistogram(INVALID_URL);
     return false;
   }
-  if (!url.SchemeIs("https")) {
-    LogUrlValidationHistogram(NOT_HTTPS);
+  if (!url.SchemeIsHTTPOrHTTPS()) {
+    LogUrlValidationHistogram(NEITHER_HTTP_HTTPS);
     return false;
   }
   if (!IsGoogleDomain(url)) {
     LogUrlValidationHistogram(NOT_GOOGLE_DOMAIN);
     return false;
   }
-
+  // We check https here, rather than before the IsGoogleDomain() check, to know
+  // how many Google domains are being rejected by the change to https only.
+  if (!url.SchemeIs("https")) {
+    LogUrlValidationHistogram(IS_GOOGLE_NOT_HTTPS);
+    return false;
+  }
   LogUrlValidationHistogram(SHOULD_APPEND);
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace variations