ServiceWorker: Distinguish SW.PageLoad w/ and w/o fetch handler

content/browser/service_worker/service_worker_metrics.cc

 // Copyright 2014 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 "content/browser/service_worker/service_worker_metrics.h"
 
 #include <limits>
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 154 matching lines @@
   UMA_HISTOGRAM_SPARSE_SLOWLY("ServiceWorker.Storage.PurgeResourceResult",
                               std::abs(net_error));
 }
 
 void ServiceWorkerMetrics::RecordDeleteAndStartOverResult(
     DeleteAndStartOverResult result) {
   UMA_HISTOGRAM_ENUMERATION("ServiceWorker.Storage.DeleteAndStartOverResult",
                             result, NUM_DELETE_AND_START_OVER_RESULT_TYPES);
 }
 
-void ServiceWorkerMetrics::CountControlledPageLoad(const GURL& url) {
+void ServiceWorkerMetrics::CountControlledPageLoad(const GURL& url,
+                                                   bool has_fetch_handler) {
   Site site = SiteFromURL(url);
+  if (site == Site::OTHER)
+    site = (has_fetch_handler) ? Site::WITH_FETCH_HANDLER
+                               : Site::WITHOUT_FETCH_HANDLER;

[falken, 2016/05/31 08:38:55]

nit: prefer braces here for multi-line if body

[shimazu, 2016/05/31 09:11:42]

Done.

   UMA_HISTOGRAM_ENUMERATION("ServiceWorker.PageLoad", static_cast<int>(site),
                             static_cast<int>(Site::NUM_TYPES));
 
   if (ShouldExcludeSiteFromHistogram(site))
     return;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&RecordURLMetricOnUI, url));
 }
 
 void ServiceWorkerMetrics::RecordStartWorkerStatus(
@@ skipping 376 matching lines @@
   } else if (failure_count == 2) {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.StartWorker.AfterFailureStreak_2",
                               status, SERVICE_WORKER_ERROR_MAX_VALUE);
   } else if (failure_count == 3) {
     UMA_HISTOGRAM_ENUMERATION("ServiceWorker.StartWorker.AfterFailureStreak_3",
                               status, SERVICE_WORKER_ERROR_MAX_VALUE);
   }
 }
 
 }  // namespace content