Revert of "Speculatively launch Service Workers on mouse/touch events."

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 54 matching lines @@
     case ServiceWorkerMetrics::EventType::FETCH_SUB_RESOURCE:
       return "_FETCH_SUB_RESOURCE";
     case ServiceWorkerMetrics::EventType::UNKNOWN:
       return "_UNKNOWN";
     case ServiceWorkerMetrics::EventType::FOREIGN_FETCH:
       return "_FOREIGN_FETCH";
     case ServiceWorkerMetrics::EventType::FETCH_WAITUNTIL:
       return "_FETCH_WAITUNTIL";
     case ServiceWorkerMetrics::EventType::FOREIGN_FETCH_WAITUNTIL:
       return "_FOREIGN_FETCH_WAITUNTIL";
-    case ServiceWorkerMetrics::EventType::NAVIGATION_HINT_LINK_MOUSE_DOWN:
-      return "_NAVIGATION_HINT_LINK_MOUSE_DOWN";
-    case ServiceWorkerMetrics::EventType::NAVIGATION_HINT_LINK_TAP_UNCONFIRMED:
-      return "_NAVIGATION_HINT_LINK_TAP_UNCONFIRMED";
-    case ServiceWorkerMetrics::EventType::NAVIGATION_HINT_LINK_TAP_DOWN:
-      return "_NAVIGATION_HINT_LINK_TAP_DOWN";
     case ServiceWorkerMetrics::EventType::EXTERNAL_REQUEST:
       return "_EXTERNAL_REQUEST";
     case ServiceWorkerMetrics::EventType::PAYMENT_REQUEST:
       return "_PAYMENT_REQUEST";
     case ServiceWorkerMetrics::EventType::BACKGROUND_FETCH_ABORT:
       return "_BACKGROUND_FETCH_ABORT";
     case ServiceWorkerMetrics::EventType::BACKGROUND_FETCH_CLICK:
       return "_BACKGROUND_FETCH_CLICK";
     case ServiceWorkerMetrics::EventType::BACKGROUND_FETCH_FAIL:
       return "_BACKGROUND_FETCH_FAIL";
@@ skipping 121 matching lines @@
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram_pointer->Add(status);
 }
 
 void RecordURLMetricOnUI(const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetContentClient()->browser()->RecordURLMetric(
       "ServiceWorker.ControlledPageUrl", url);
 }
 
-// Returns true when the event is for a navigation hint.
-bool IsNavigationHintEvent(ServiceWorkerMetrics::EventType event_type) {
-  using EventType = ServiceWorkerMetrics::EventType;
-  return event_type == EventType::NAVIGATION_HINT_LINK_MOUSE_DOWN ||
-         event_type == EventType::NAVIGATION_HINT_LINK_TAP_UNCONFIRMED ||
-         event_type == EventType::NAVIGATION_HINT_LINK_TAP_DOWN;
-}
-
 enum EventHandledRatioType {
   EVENT_HANDLED_NONE,
   EVENT_HANDLED_SOME,
   EVENT_HANDLED_ALL,
   NUM_EVENT_HANDLED_RATIO_TYPE,
 };
 
 }  // namespace
 
 using ScopedEventRecorder = ServiceWorkerMetrics::ScopedEventRecorder;
 
-ScopedEventRecorder::ScopedEventRecorder(
-    ServiceWorkerMetrics::EventType start_worker_purpose)
-    : start_worker_purpose_(start_worker_purpose) {}
+ScopedEventRecorder::ScopedEventRecorder() {}
 
 ScopedEventRecorder::~ScopedEventRecorder() {
   for (const auto& ev : event_stats_) {
     RecordEventHandledRatio(ev.first, ev.second.handled_events,
                             ev.second.fired_events);
   }
-  if (IsNavigationHintEvent(start_worker_purpose_)) {
-    RecordNavigationHintPrecision(
-        start_worker_purpose_,
-        event_stats_[EventType::FETCH_MAIN_FRAME].fired_events != 0 ||
-            event_stats_[EventType::FETCH_SUB_FRAME].fired_events != 0);
-  }
 }
 
 void ScopedEventRecorder::RecordEventHandledStatus(
     ServiceWorkerMetrics::EventType event,
     bool handled) {
   event_stats_[event].fired_events++;
   if (handled)
     event_stats_[event].handled_events++;
 }
 
@@ skipping 22 matching lines @@
       UMA_HISTOGRAM_ENUMERATION(
           "ServiceWorker.EventHandledRatioType.ForeignFetch", type,
           NUM_EVENT_HANDLED_RATIO_TYPE);
       break;
     default:
       // Do nothing.
       break;
   }
 }
 
-void ScopedEventRecorder::RecordNavigationHintPrecision(
-    ServiceWorkerMetrics::EventType start_worker_purpose,
-    bool frame_fetch_event_fired) {
-  DCHECK(IsNavigationHintEvent(start_worker_purpose));
-  UMA_HISTOGRAM_BOOLEAN("ServiceWorker.NavigationHintPrecision",
-                        frame_fetch_event_fired);
-  switch (start_worker_purpose) {
-    case EventType::NAVIGATION_HINT_LINK_MOUSE_DOWN:
-      UMA_HISTOGRAM_BOOLEAN(
-          "ServiceWorker.NavigationHintPrecision.LINK_MOUSE_DOWN",
-          frame_fetch_event_fired);
-      break;
-    case EventType::NAVIGATION_HINT_LINK_TAP_UNCONFIRMED:
-      UMA_HISTOGRAM_BOOLEAN(
-          "ServiceWorker.NavigationHintPrecision.LINK_TAP_UNCONFIRMED",
-          frame_fetch_event_fired);
-      break;
-    case EventType::NAVIGATION_HINT_LINK_TAP_DOWN:
-      UMA_HISTOGRAM_BOOLEAN(
-          "ServiceWorker.NavigationHintPrecision.LINK_TAP_DOWN",
-          frame_fetch_event_fired);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-}
-
 const char* ServiceWorkerMetrics::EventTypeToString(EventType event_type) {
   switch (event_type) {
     case EventType::ACTIVATE:
       return "Activate";
     case EventType::INSTALL:
       return "Install";
     case EventType::SYNC:
       return "Sync";
     case EventType::NOTIFICATION_CLICK:
       return "Notification Click";
@@ skipping 12 matching lines @@
     case EventType::FETCH_SUB_RESOURCE:
       return "Fetch Subresource";
     case EventType::UNKNOWN:
       return "Unknown";
     case EventType::FOREIGN_FETCH:
       return "Foreign Fetch";
     case EventType::FETCH_WAITUNTIL:
       return "Fetch WaitUntil";
     case EventType::FOREIGN_FETCH_WAITUNTIL:
       return "Foreign Fetch WaitUntil";
-    case EventType::NAVIGATION_HINT_LINK_MOUSE_DOWN:
-      return "Navigation Hint Link Mouse Down";
-    case EventType::NAVIGATION_HINT_LINK_TAP_UNCONFIRMED:
-      return "Navigation Hint Link Tap Unconfirmed";
-    case EventType::NAVIGATION_HINT_LINK_TAP_DOWN:
-      return "Navigation Hint Link Tap Down";
     case EventType::EXTERNAL_REQUEST:
       return "External Request";
     case EventType::PAYMENT_REQUEST:
       return "Payment Request";
     case EventType::BACKGROUND_FETCH_ABORT:
       return "Background Fetch Abort";
     case EventType::BACKGROUND_FETCH_CLICK:
       return "Background Fetch Click";
     case EventType::BACKGROUND_FETCH_FAIL:
       return "Background Fetch Fail";
@@ skipping 338 matching lines @@
                                  time);
       break;
     case EventType::BACKGROUND_FETCH_FAIL:
       UMA_HISTOGRAM_MEDIUM_TIMES("ServiceWorker.BackgroundFetchFailEvent.Time",
                                  time);
       break;
     case EventType::BACKGROUND_FETCHED:
       UMA_HISTOGRAM_MEDIUM_TIMES("ServiceWorker.BackgroundFetchedEvent.Time",
                                  time);
       break;
-    // Those navigation hints should not be sent as request events.
-    case EventType::NAVIGATION_HINT_LINK_MOUSE_DOWN:
-    case EventType::NAVIGATION_HINT_LINK_TAP_UNCONFIRMED:
-    case EventType::NAVIGATION_HINT_LINK_TAP_DOWN:
 
     case EventType::UNKNOWN:
     case EventType::NUM_TYPES:
       NOTREACHED() << "Invalid event type";
       break;
   }
 }
 
 void ServiceWorkerMetrics::RecordFetchEventStatus(
     bool is_main_resource,
@@ skipping 283 matching lines @@
   constexpr base::TimeDelta kMax = base::TimeDelta::FromDays(1);
   // Set the bucket count to 50 since that is the recommended value for all
   // histograms.
   const int kBucketCount = 50;
 
   UMA_HISTOGRAM_CUSTOM_TIMES("ServiceWorker.Runtime", time, kMin, kMax,
                              kBucketCount);
 }
 
 }  // namespace content