Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/storage/DOMWindowStorage.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/page/Page.h"
 #include "modules/storage/Storage.h"
 #include "modules/storage/StorageNamespace.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 DOMWindowStorage::DOMWindowStorage(LocalDOMWindow& window)
     : DOMWindowProperty(window.frame())
     , m_window(&window)
 {
 }
 
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowStorage);
-
 DEFINE_TRACE(DOMWindowStorage)
 {
     visitor->trace(m_window);
     visitor->trace(m_sessionStorage);
     visitor->trace(m_localStorage);
-    WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
+    HeapSupplement<LocalDOMWindow>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 // static
 const char* DOMWindowStorage::supplementName()
 {
     return "DOMWindowStorage";
 }
 
 // static
 DOMWindowStorage& DOMWindowStorage::from(LocalDOMWindow& window)
 {
-    DOMWindowStorage* supplement = static_cast<DOMWindowStorage*>(WillBeHeapSupplement<LocalDOMWindow>::from(window, supplementName()));
+    DOMWindowStorage* supplement = static_cast<DOMWindowStorage*>(HeapSupplement<LocalDOMWindow>::from(window, supplementName()));
     if (!supplement) {
         supplement = new DOMWindowStorage(window);
-        provideTo(window, supplementName(), adoptPtrWillBeNoop(supplement));
+        provideTo(window, supplementName(), (supplement));
     }
     return *supplement;
 }
 
 // static
 Storage* DOMWindowStorage::sessionStorage(DOMWindow& window, ExceptionState& exceptionState)
 {
     return from(toLocalDOMWindow(window)).sessionStorage(exceptionState);
 }
 
@@ skipping 76 matching lines @@
     StorageArea* storageArea = StorageNamespace::localStorageArea(document->securityOrigin());
     if (!storageArea->canAccessStorage(m_window->frame())) {
         exceptionState.throwSecurityError(accessDeniedMessage);
         return nullptr;
     }
     m_localStorage = Storage::create(m_window->frame(), storageArea);
     return m_localStorage;
 }
 
 } // namespace blink