ServiceWorker: Enable UseCounter for ServiceWorkerGlobalScope

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 338 matching lines @@
           webAppRequest),
       observer);
   workerGlobalScope()->dispatchExtendableEvent(event, observer);
 }
 
 bool ServiceWorkerGlobalScopeProxy::hasFetchEventHandler() {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope->hasEventListeners(EventTypeNames::fetch);
 }
 
-void ServiceWorkerGlobalScopeProxy::countFeature(UseCounter::Feature) {
-  // TODO(nhiroki): Support UseCounter for ServiceWorker. Send an IPC message to
-  // the browser process and ask each controlled document to record API use in
-  // its UseCoutner (https://crbug.com/376039).
+void ServiceWorkerGlobalScopeProxy::countFeature(UseCounter::Feature feature) {
+  client().countFeature(static_cast<uint32_t>(feature));
 }
 
-void ServiceWorkerGlobalScopeProxy::countDeprecation(UseCounter::Feature) {
-  // TODO(nhiroki): Support UseCounter for ServiceWorker. Send an IPC message to
-  // the browser process and ask each controlled document to record API use in
-  // its UseCoutner (https://crbug.com/376039).
+void ServiceWorkerGlobalScopeProxy::countDeprecation(
+    UseCounter::Feature feature) {
+  // Go through the same code path with countFeature() because a deprecation
+  // message is already shown on the worker console and a remaining work is just
+  // to record an API use.

[haraken, 2017/02/08 04:28:45]

Nit: I'd prefer preparing separate methods for countFeature and
countDeprecation, instead of judging that by making countFeature call
Deprecation::deprecationMessage.

[nhiroki, 2017/02/09 05:11:32]

Removed the switch instead of adding a separate path. That was just for
bypassing DCHECK in UseCounter::count(Feature feature). I removed the check in a
separate patch for SharedWorker:
https://codereview.chromium.org/2586863002/#ps460001

In addition, calling countDeprecation() in document-side was wrong because it
prints a duplicate warning message.

+  countFeature(feature);
 }
 
 void ServiceWorkerGlobalScopeProxy::reportException(
     const String& errorMessage,
     std::unique_ptr<SourceLocation> location,
     int exceptionId) {
   client().reportException(errorMessage, location->lineNumber(),
                            location->columnNumber(), location->url());
 }
 
@@ skipping 104 matching lines @@
   return *m_document;
 }
 
 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
     const {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope;
 }
 
 }  // namespace blink