Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/workers/SharedWorker.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Apple 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.
@@ skipping 24 matching lines @@
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/workers/AbstractWorker.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class ExceptionState;
 
-class CORE_EXPORT SharedWorker final : public AbstractWorker, public HeapSupplementable<SharedWorker>, public ActiveScriptWrappable {
+class CORE_EXPORT SharedWorker final : public AbstractWorker, public Supplementable<SharedWorker>, public ActiveScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(SharedWorker);
 public:
     static SharedWorker* create(ExecutionContext*, const String& url, const String& name, ExceptionState&);
     ~SharedWorker() override;
 
     MessagePort* port() const { return m_port.get(); }
 
     const AtomicString& interfaceName() const override;
 
     void setIsBeingConnected(bool b) { m_isBeingConnected = b; }
 
     bool hasPendingActivity() const final;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit SharedWorker(ExecutionContext*);
 
     Member<MessagePort> m_port;
     bool m_isBeingConnected;
 };
 
 } // namespace blink
 
 #endif // SharedWorker_h