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

content/browser/service_worker/service_worker_metrics.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_METRICS_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_METRICS_H_
 
 #include <stddef.h>
 
 #include "base/macros.h"
@@ skipping 82 matching lines @@
     FETCH_SUB_FRAME = 11,
     FETCH_SHARED_WORKER = 12,
     FETCH_SUB_RESOURCE = 13,
     UNKNOWN = 14,  // Used when event type is not known.
     FOREIGN_FETCH = 15,
     // Add new events to record here.
     NUM_TYPES
   };
 
   // Used for UMA. Append only.
-  enum class Site { OTHER, NEW_TAB_PAGE, NUM_TYPES };
+  enum class Site {
+    OTHER,

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

Add a comment that this is obsolete.

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

Done.

+    NEW_TAB_PAGE,
+    WITH_FETCH_HANDLER,
+    WITHOUT_FETCH_HANDLER,
+    NUM_TYPES
+  };
 
   // Not used for UMA.
   enum class StartSituation {
     UNKNOWN,
     DURING_STARTUP,
     EXISTING_PROCESS,
     NEW_PROCESS
   };
 
   // Not used for UMA.
@@ skipping 17 matching lines @@
   static void CountOpenDatabaseResult(ServiceWorkerDatabase::Status status);
   static void CountReadDatabaseResult(ServiceWorkerDatabase::Status status);
   static void CountWriteDatabaseResult(ServiceWorkerDatabase::Status status);
   static void RecordDestroyDatabaseResult(ServiceWorkerDatabase::Status status);
 
   // Used for ServiceWorkerStorage.
   static void RecordPurgeResourceResult(int net_error);
   static void RecordDeleteAndStartOverResult(DeleteAndStartOverResult result);
 
   // Counts the number of page loads controlled by a Service Worker.
-  static void CountControlledPageLoad(const GURL& url);
+  static void CountControlledPageLoad(const GURL& url, bool has_fetch_handler);
 
   // Records the result of trying to start a worker. |is_installed| indicates
   // whether the version has been installed.
   static void RecordStartWorkerStatus(ServiceWorkerStatusCode status,
                                       EventType purpose,
                                       bool is_installed);
 
   // Records the time taken to successfully start a worker. |is_installed|
   // indicates whether the version has been installed.
   static void RecordStartWorkerTime(base::TimeDelta time,
@@ skipping 69 matching lines @@
   static void RecordStartStatusAfterFailure(int failure_count,
                                             ServiceWorkerStatusCode status);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ServiceWorkerMetrics);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_METRICS_H_