HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/battery/NavigatorBattery.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/battery/NavigatorBattery.h"
 
 #include "core/frame/LocalFrame.h"
 #include "modules/battery/BatteryManager.h"
 
 namespace blink {
@@ skipping 15 matching lines @@
     return m_batteryManager->startRequest(scriptState);
 }
 
 const char* NavigatorBattery::supplementName()
 {
     return "NavigatorBattery";
 }
 
 NavigatorBattery& NavigatorBattery::from(Navigator& navigator)
 {
-    NavigatorBattery* supplement = static_cast<NavigatorBattery*>(HeapSupplement<Navigator>::from(navigator, supplementName()));
+    NavigatorBattery* supplement = static_cast<NavigatorBattery*>(Supplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorBattery();
         provideTo(navigator, supplementName(), supplement);
     }
     return *supplement;
 }
 
 DEFINE_TRACE(NavigatorBattery)
 {
     visitor->trace(m_batteryManager);
-    HeapSupplement<Navigator>::trace(visitor);
+    Supplement<Navigator>::trace(visitor);
 }
 
 } // namespace blink