HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/donottrack/NavigatorDoNotTrack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
     : DOMWindowProperty(frame)
 {
 }
 
 NavigatorDoNotTrack::~NavigatorDoNotTrack()
 {
 }
 
 DEFINE_TRACE(NavigatorDoNotTrack)
 {
-    HeapSupplement<Navigator>::trace(visitor);
+    Supplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 const char* NavigatorDoNotTrack::supplementName()
 {
     return "NavigatorDoNotTrack";
 }
 
 NavigatorDoNotTrack& NavigatorDoNotTrack::from(Navigator& navigator)
 {
-    NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(HeapSupplement<Navigator>::from(navigator, supplementName()));
+    NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(Supplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorDoNotTrack(navigator.frame());
         provideTo(navigator, supplementName(), supplement);
     }
     return *supplement;
 }
 
 String NavigatorDoNotTrack::doNotTrack(Navigator& navigator)
 {
     return NavigatorDoNotTrack::from(navigator).doNotTrack();
 }
 
 String NavigatorDoNotTrack::doNotTrack()
 {
     if (!frame() || !frame()->loader().client())
         return String();
     return frame()->loader().client()->doNotTrackValue();
 }
 
 } // namespace blink