HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/plugins/NavigatorPlugins.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/plugins/NavigatorPlugins.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/frame/Settings.h"
 #include "modules/plugins/DOMMimeTypeArray.h"
@@ skipping 17 matching lines @@
     if (!supplement) {
         supplement = new NavigatorPlugins(navigator);
         provideTo(navigator, supplementName(), supplement);
     }
     return *supplement;
 }
 
 // static
 NavigatorPlugins* NavigatorPlugins::toNavigatorPlugins(Navigator& navigator)
 {
-    return static_cast<NavigatorPlugins*>(HeapSupplement<Navigator>::from(navigator, supplementName()));
+    return static_cast<NavigatorPlugins*>(Supplement<Navigator>::from(navigator, supplementName()));
 }
 
 // static
 const char* NavigatorPlugins::supplementName()
 {
     return "NavigatorPlugins";
 }
 
 // static
 DOMPluginArray* NavigatorPlugins::plugins(Navigator& navigator)
@@ skipping 24 matching lines @@
 {
     if (!m_mimeTypes)
         m_mimeTypes = DOMMimeTypeArray::create(frame);
     return m_mimeTypes.get();
 }
 
 DEFINE_TRACE(NavigatorPlugins)
 {
     visitor->trace(m_plugins);
     visitor->trace(m_mimeTypes);
-    HeapSupplement<Navigator>::trace(visitor);
+    Supplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink