Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/html/imports/HTMLImportsController.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 32 matching lines @@
 
 const char* HTMLImportsController::supplementName()
 {
     return "HTMLImportsController";
 }
 
 void HTMLImportsController::provideTo(Document& master)
 {
     RawPtr<HTMLImportsController> controller = new HTMLImportsController(master);
     master.setImportsController(controller.get());
-    HeapSupplement<Document>::provideTo(master, supplementName(), controller.release());
+    Supplement<Document>::provideTo(master, supplementName(), controller.release());
 }
 
 void HTMLImportsController::removeFrom(Document& master)
 {
     HTMLImportsController* controller = master.importsController();
     ASSERT(controller);
     controller->dispose();
-    static_cast<HeapSupplementable<Document>&>(master).removeSupplement(supplementName());
+    static_cast<Supplementable<Document>&>(master).removeSupplement(supplementName());
     master.setImportsController(nullptr);
 }
 
 HTMLImportsController::HTMLImportsController(Document& master)
     : m_root(HTMLImportTreeRoot::create(&master))
 {
     UseCounter::count(master, UseCounter::HTMLImports);
 }
 
 HTMLImportsController::~HTMLImportsController()
@@ skipping 97 matching lines @@
 
 Document* HTMLImportsController::loaderDocumentAt(size_t i) const
 {
     return loaderAt(i)->document();
 }
 
 DEFINE_TRACE(HTMLImportsController)
 {
     visitor->trace(m_root);
     visitor->trace(m_loaders);
-    HeapSupplement<Document>::trace(visitor);
+    Supplement<Document>::trace(visitor);
 }
 
 } // namespace blink