HeapSupplements are now just Supplements.

third_party/WebKit/Source/modules/filesystem/LocalFileSystem.h

 /*
  * Copyright (C) 2010 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 @@
 namespace blink {
 
 class AsyncFileSystemCallbacks;
 class CallbackWrapper;
 class FileSystemClient;
 class ExecutionContext;
 class KURL;
 class LocalFrame;
 class WebFileSystem;
 
-class LocalFileSystem final : public GarbageCollectedFinalized<LocalFileSystem>, public HeapSupplement<LocalFrame>, public HeapSupplement<WorkerClients> {
+class LocalFileSystem final : public GarbageCollectedFinalized<LocalFileSystem>, public Supplement<LocalFrame>, public Supplement<WorkerClients> {
     USING_GARBAGE_COLLECTED_MIXIN(LocalFileSystem);
     WTF_MAKE_NONCOPYABLE(LocalFileSystem);
 public:
     static RawPtr<LocalFileSystem> create(PassOwnPtr<FileSystemClient>);
     virtual ~LocalFileSystem();
 
     void resolveURL(ExecutionContext*, const KURL&, PassOwnPtr<AsyncFileSystemCallbacks>);
     void requestFileSystem(ExecutionContext*, FileSystemType, long long size, PassOwnPtr<AsyncFileSystemCallbacks>);
     void deleteFileSystem(ExecutionContext*, FileSystemType, PassOwnPtr<AsyncFileSystemCallbacks>);
 
     FileSystemClient* client() { return m_client.get(); }
 
     static const char* supplementName();
     static LocalFileSystem* from(ExecutionContext&);
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
-        HeapSupplement<LocalFrame>::trace(visitor);
-        HeapSupplement<WorkerClients>::trace(visitor);
+        Supplement<LocalFrame>::trace(visitor);
+        Supplement<WorkerClients>::trace(visitor);
     }
 
 protected:
     explicit LocalFileSystem(PassOwnPtr<FileSystemClient>);
 
 private:
     WebFileSystem* fileSystem() const;
     void requestFileSystemAccessInternal(ExecutionContext*, PassOwnPtr<SameThreadClosure> allowed, PassOwnPtr<SameThreadClosure> denied);
     void fileSystemNotAvailable(RawPtr<ExecutionContext>, CallbackWrapper*);
     void fileSystemNotAllowedInternal(RawPtr<ExecutionContext>, CallbackWrapper*);
     void fileSystemAllowedInternal(RawPtr<ExecutionContext>, FileSystemType, CallbackWrapper*);
     void resolveURLInternal(RawPtr<ExecutionContext>, const KURL&, CallbackWrapper*);
     void deleteFileSystemInternal(RawPtr<ExecutionContext>, FileSystemType, CallbackWrapper*);
     OwnPtr<FileSystemClient> m_client;
 };
 
 } // namespace blink
 
 #endif // LocalFileSystem_h