HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.h

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 22 matching lines @@
 #include "platform/heap/Handle.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ExceptionState;
 class LocalFrame;
 class Navigator;
 
-class MODULES_EXPORT NavigatorContentUtils final : public GarbageCollectedFinalized<NavigatorContentUtils>, public HeapSupplement<LocalFrame> {
+class MODULES_EXPORT NavigatorContentUtils final : public GarbageCollectedFinalized<NavigatorContentUtils>, public Supplement<LocalFrame> {
     USING_GARBAGE_COLLECTED_MIXIN(NavigatorContentUtils);
 public:
     virtual ~NavigatorContentUtils();
 
     static NavigatorContentUtils* from(LocalFrame&);
     static const char* supplementName();
 
     static void registerProtocolHandler(Navigator&, const String& scheme, const String& url, const String& title, ExceptionState&);
     static String isProtocolHandlerRegistered(Navigator&, const String& scheme, const String& url, ExceptionState&);
     static void unregisterProtocolHandler(Navigator&, const String& scheme, const String& url, ExceptionState&);
 
     static RawPtr<NavigatorContentUtils> create(RawPtr<NavigatorContentUtilsClient>);
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_client);
-        HeapSupplement<LocalFrame>::trace(visitor);
+        Supplement<LocalFrame>::trace(visitor);
     }
 
     void setClientForTest(RawPtr<NavigatorContentUtilsClient> client) { m_client = client; }
 
 private:
     explicit NavigatorContentUtils(RawPtr<NavigatorContentUtilsClient> client)
         : m_client(client)
     {
     }
 
     NavigatorContentUtilsClient* client() { return m_client.get(); }
 
     Member<NavigatorContentUtilsClient> m_client;
 };
 
 } // namespace blink
 
 #endif // NavigatorContentUtils_h