HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

 // 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 "modules/serviceworkers/ServiceWorkerContainerClient.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/FrameLoaderClient.h"
@@ skipping 19 matching lines @@
 const char* ServiceWorkerContainerClient::supplementName()
 {
     return "ServiceWorkerContainerClient";
 }
 
 ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContext* context)
 {
     if (context->isWorkerGlobalScope()) {
         WorkerClients* clients = toWorkerGlobalScope(context)->clients();
         ASSERT(clients);
-        return static_cast<ServiceWorkerContainerClient*>(HeapSupplement<WorkerClients>::from(clients, supplementName()));
+        return static_cast<ServiceWorkerContainerClient*>(Supplement<WorkerClients>::from(clients, supplementName()));
     }
     Document* document = toDocument(context);
     if (!document->frame())
         return nullptr;
 
-    ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(HeapSupplement<Document>::from(document, supplementName()));
+    ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(Supplement<Document>::from(document, supplementName()));
     if (!client) {
         client = new ServiceWorkerContainerClient(document->frame()->loader().client()->createServiceWorkerProvider());
-        HeapSupplement<Document>::provideTo(*document, supplementName(), client);
+        Supplement<Document>::provideTo(*document, supplementName(), client);
     }
     return client;
 }
 
 void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, PassOwnPtr<WebServiceWorkerProvider> provider)
 {
     clients->provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(provider));
 }
 
 } // namespace blink