HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/vr/NavigatorVRDevice.cpp

 // Copyright 2015 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/vr/NavigatorVRDevice.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 14 matching lines @@
 NavigatorVRDevice* NavigatorVRDevice::from(Document& document)
 {
     if (!document.frame() || !document.frame()->domWindow())
         return 0;
     Navigator& navigator = *document.frame()->domWindow()->navigator();
     return &from(navigator);
 }
 
 NavigatorVRDevice& NavigatorVRDevice::from(Navigator& navigator)
 {
-    NavigatorVRDevice* supplement = static_cast<NavigatorVRDevice*>(HeapSupplement<Navigator>::from(navigator, supplementName()));
+    NavigatorVRDevice* supplement = static_cast<NavigatorVRDevice*>(Supplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorVRDevice(navigator.frame());
         provideTo(navigator, supplementName(), supplement);
     }
     return *supplement;
 }
 
 ScriptPromise NavigatorVRDevice::getVRDevices(ScriptState* scriptState, Navigator& navigator)
 {
     return NavigatorVRDevice::from(navigator).getVRDevices(scriptState);
@@ skipping 22 matching lines @@
     if (!frame())
         return 0;
 
     return VRController::from(*frame());
 }
 
 DEFINE_TRACE(NavigatorVRDevice)
 {
     visitor->trace(m_hardwareUnits);
 
-    HeapSupplement<Navigator>::trace(visitor);
+    Supplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 NavigatorVRDevice::NavigatorVRDevice(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
     m_hardwareUnits = new VRHardwareUnitCollection(this);
 }
 
 NavigatorVRDevice::~NavigatorVRDevice()
 {
 }
 
 const char* NavigatorVRDevice::supplementName()
 {
     return "NavigatorVRDevice";
 }
 
 } // namespace blink