Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined.

Source/web/ContextFeaturesClientImpl.cpp

 /*
  * 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:
  *
  *     * 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 21 matching lines @@
 #include "web/ContextFeaturesClientImpl.h"
 
 #include "core/dom/Document.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/web/WebContentSettingsClient.h"
 #include "public/web/WebDocument.h"
 #include "web/WebLocalFrameImpl.h"
 
 namespace blink {
 
-class ContextFeaturesCache final : public NoBaseWillBeGarbageCollectedFinalized<ContextFeaturesCache>, public DocumentSupplement {
+class ContextFeaturesCache final : public NoBaseWillBeGarbageCollectedFinalized<ContextFeaturesCache>, public WillBeHeapSupplement<Document> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ContextFeaturesCache);
 public:
     class Entry {
     public:
         enum Value {
             IsEnabled,
             IsDisabled,
             NeedsRefresh
         };
 
@@ skipping 31 matching lines @@
     {
         size_t index = static_cast<size_t>(type);
         ASSERT_WITH_SECURITY_IMPLICATION(index < ContextFeatures::FeatureTypeSize);
         return m_entries[index];
     }
 
     void validateAgainst(Document*);
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
-        DocumentSupplement::trace(visitor);
+        WillBeHeapSupplement<Document>::trace(visitor);
     }
 
 private:
     String m_domain;
     Entry m_entries[ContextFeatures::FeatureTypeSize];
 };
 
 const char* ContextFeaturesCache::supplementName()
 {
     return "ContextFeaturesCache";
 }
 
 ContextFeaturesCache& ContextFeaturesCache::from(Document& document)
 {
-    ContextFeaturesCache* cache = static_cast<ContextFeaturesCache*>(DocumentSupplement::from(document, supplementName()));
+    ContextFeaturesCache* cache = static_cast<ContextFeaturesCache*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
     if (!cache) {
         cache = new ContextFeaturesCache();
-        DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
+        WillBeHeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
     }
 
     return *cache;
 }
 
 void ContextFeaturesCache::validateAgainst(Document* document)
 {
     String currentDomain = document->securityOrigin()->domain();
     if (currentDomain == m_domain)
         return;
@@ skipping 25 matching lines @@
 
     switch (type) {
     case ContextFeatures::MutationEvents:
         return frame->contentSettingsClient()->allowMutationEvents(defaultValue);
     default:
         return defaultValue;
     }
 }
 
 } // namespace blink