ServiceWorker: Enable UseCounter for ServiceWorkerGlobalScope

content/browser/service_worker/service_worker_database.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_database.h"
 
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 1273 matching lines @@
     out->origin_trial_tokens = origin_trial_tokens;
   }
   if (data.has_navigation_preload_state()) {
     const ServiceWorkerNavigationPreloadState& state =
         data.navigation_preload_state();
     out->navigation_preload_state.enabled = state.enabled();
     if (state.has_header())
       out->navigation_preload_state.header = state.header();
   }
 
+  for (uint32_t feature : data.used_features())
+    out->used_features.insert(feature);
+
   return ServiceWorkerDatabase::STATUS_OK;
 }
 
 void ServiceWorkerDatabase::WriteRegistrationDataInBatch(
     const RegistrationData& registration,
     leveldb::WriteBatch* batch) {
   DCHECK(batch);
 
   // The registration id and version id should be bumped before this.
   DCHECK_GT(next_avail_registration_id_, registration.registration_id);
@@ skipping 26 matching lines @@
       feature_out->set_name(feature.first);
       for (const auto& token : feature.second)
         feature_out->add_tokens(token);
     }
   }
   ServiceWorkerNavigationPreloadState* state =
       data.mutable_navigation_preload_state();
   state->set_enabled(registration.navigation_preload_state.enabled);
   state->set_header(registration.navigation_preload_state.header);
 
+  for (int32_t feature : registration.used_features)

[dcheng, 2017/02/13 21:25:02]

Nit: uint32_t feature

[nhiroki, 2017/02/14 02:22:34]

Good catch! Fixed.

+    data.add_used_features(feature);
+
   std::string value;
   bool success = data.SerializeToString(&value);
   DCHECK(success);
   GURL origin = registration.scope.GetOrigin();
   batch->Put(CreateRegistrationKey(data.registration_id(), origin), value);
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceRecords(
     const RegistrationData& registration,
     std::vector<ResourceRecord>* resources) {
@@ skipping 364 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content