HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationController.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/screen_orientation/ScreenOrientationController.h"
 
 #include "core/events/Event.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "modules/screen_orientation/ScreenOrientation.h"
 #include "modules/screen_orientation/ScreenOrientationDispatcher.h"
 #include "platform/LayoutTestSupport.h"
 #include "public/platform/WebScreenInfo.h"
 #include "public/platform/modules/screen_orientation/WebScreenOrientationClient.h"
 
 namespace blink {
 
 ScreenOrientationController::~ScreenOrientationController()
 {
 }
 
 void ScreenOrientationController::provideTo(LocalFrame& frame, WebScreenOrientationClient* client)
 {
     ASSERT(RuntimeEnabledFeatures::screenOrientationEnabled());
 
     ScreenOrientationController* controller = new ScreenOrientationController(frame, client);
-    HeapSupplement<LocalFrame>::provideTo(frame, supplementName(), controller);
+    Supplement<LocalFrame>::provideTo(frame, supplementName(), controller);
 }
 
 ScreenOrientationController* ScreenOrientationController::from(LocalFrame& frame)
 {
-    return static_cast<ScreenOrientationController*>(HeapSupplement<LocalFrame>::from(frame, supplementName()));
+    return static_cast<ScreenOrientationController*>(Supplement<LocalFrame>::from(frame, supplementName()));
 }
 
 ScreenOrientationController::ScreenOrientationController(LocalFrame& frame, WebScreenOrientationClient* client)
     : LocalFrameLifecycleObserver(&frame)
     , PlatformEventController(frame.page())
     , m_client(client)
     , m_dispatchEventTimer(this, &ScreenOrientationController::dispatchEventTimerFired)
 {
 }
 
@@ skipping 161 matching lines @@
     if (m_orientation && page()->isPageVisible())
         startUpdating();
     else
         stopUpdating();
 }
 
 DEFINE_TRACE(ScreenOrientationController)
 {
     visitor->trace(m_orientation);
     LocalFrameLifecycleObserver::trace(visitor);
-    HeapSupplement<LocalFrame>::trace(visitor);
+    Supplement<LocalFrame>::trace(visitor);
     PlatformEventController::trace(visitor);
 }
 
 } // namespace blink