HeapSupplements are now just Supplements.

third_party/WebKit/Source/platform/Supplementable.h

 /*
  * Copyright (C) 2012 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 145 matching lines @@
 #endif
     {
     }
 
 #if ENABLE(ASSERT)
 private:
     ThreadIdentifier m_threadId;
 #endif
 };
 
-// TODO(sof): replace all HeapSupplement<T> uses with Supplement<T>.
-#define HeapSupplement Supplement
-
 template<typename T>
 struct ThreadingTrait<Supplement<T>> {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 template<typename T>
 struct ThreadingTrait<Supplementable<T>> {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 } // namespace blink
 
 #endif // Supplementable_h