Index: content/browser/service_worker/service_worker_provider_host.cc |
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc |
index a32fdd32fea0d945eff3b333e822dd761e6becec..daee9c38ebe6ddda35ad8dc03be5db6cff3a97c8 100644 |
--- a/content/browser/service_worker/service_worker_provider_host.cc |
+++ b/content/browser/service_worker/service_worker_provider_host.cc |
@@ -248,7 +248,8 @@ void ServiceWorkerProviderHost::SetControllerVersionAttribute( |
DCHECK(IsProviderForClient()); |
Send(new ServiceWorkerMsg_SetControllerServiceWorker( |
render_thread_id_, provider_id(), GetOrCreateServiceWorkerHandle(version), |
- notify_controllerchange)); |
+ notify_controllerchange, |
+ version ? version->used_features() : std::set<uint32_t>())); |
} |
void ServiceWorkerProviderHost::SetHostedVersion( |
@@ -459,6 +460,13 @@ void ServiceWorkerProviderHost::PostMessageToClient( |
Send(new ServiceWorkerMsg_MessageToDocument(params)); |
} |
+void ServiceWorkerProviderHost::CountFeature(uint32_t feature) { |
+ if (!dispatcher_host_) |
+ return; // Could be NULL in some tests. |
falken
2017/02/08 05:01:53
Is this really hit in some tests? I've come to dis
nhiroki
2017/02/09 05:11:31
I hit this before but now cannot... so removed thi
nhiroki
2017/02/13 09:39:40
Hm... browser_side_navigation_browser_tests on lin
|
+ Send(new ServiceWorkerMsg_CountFeature(render_thread_id_, provider_id(), |
+ feature)); |
+} |
+ |
void ServiceWorkerProviderHost::AddScopedProcessReferenceToPattern( |
const GURL& pattern) { |
associated_patterns_.push_back(pattern); |
@@ -731,7 +739,8 @@ void ServiceWorkerProviderHost::FinalizeInitialization( |
render_thread_id_, provider_id(), |
GetOrCreateServiceWorkerHandle( |
associated_registration_->active_version()), |
- false /* shouldNotifyControllerChange */)); |
+ false /* shouldNotifyControllerChange */, |
+ associated_registration_->active_version()->used_features())); |
} |
} |
} |