Simplify Supplementables post Oilpan.

third_party/WebKit/Source/modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 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
@@ skipping 28 matching lines @@
 
 WorkerGlobalScopeIndexedDatabase::~WorkerGlobalScopeIndexedDatabase()
 {
 }
 
 const char* WorkerGlobalScopeIndexedDatabase::supplementName()
 {
     return "WorkerGlobalScopeIndexedDatabase";
 }
 
-WorkerGlobalScopeIndexedDatabase& WorkerGlobalScopeIndexedDatabase::from(HeapSupplementable<WorkerGlobalScope>& context)
+WorkerGlobalScopeIndexedDatabase& WorkerGlobalScopeIndexedDatabase::from(Supplementable<WorkerGlobalScope>& context)
 {
-    WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(HeapSupplement<WorkerGlobalScope>::from(context, supplementName()));
+    WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(Supplement<WorkerGlobalScope>::from(context, supplementName()));
     if (!supplement) {
-        supplement = new WorkerGlobalScopeIndexedDatabase();
-        provideTo(context, supplementName(), adoptPtrWillBeNoop(supplement));
+        supplement = new WorkerGlobalScopeIndexedDatabase;
+        provideTo(context, supplementName(), supplement);
     }
     return *supplement;
 }
 
-IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB(HeapSupplementable<WorkerGlobalScope>& context)
+IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB(Supplementable<WorkerGlobalScope>& context)
 {
     return from(context).indexedDB();
 }
 
 IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
 {
     if (!m_idbFactory)
         m_idbFactory = IDBFactory::create(IndexedDBClient::create());
     return m_idbFactory.get();
 }
 
 DEFINE_TRACE(WorkerGlobalScopeIndexedDatabase)
 {
     visitor->trace(m_idbFactory);
-    HeapSupplement<WorkerGlobalScope>::trace(visitor);
+    Supplement<WorkerGlobalScope>::trace(visitor);
 }
 
 } // namespace blink