Oilpan: have Navigator and its supplements be on the heap by default.

Source/modules/serviceworkers/NavigatorServiceWorker.h

 // Copyright 2014 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.
 
 #ifndef NavigatorServiceWorker_h
 #define NavigatorServiceWorker_h
 
 #include "core/frame/Navigator.h"
 #include "modules/ModulesExport.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class Document;
 class Navigator;
 class ServiceWorkerContainer;
 
-class MODULES_EXPORT NavigatorServiceWorker final : public NoBaseWillBeGarbageCollected<NavigatorServiceWorker>, public WillBeHeapSupplement<Navigator>, DOMWindowProperty {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
-    DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorServiceWorker);
+// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead.
+class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollectedFinalized<NavigatorServiceWorker>, public HeapSupplement<Navigator>, DOMWindowProperty {
+    USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
 public:
     static NavigatorServiceWorker* from(Document&);
     static NavigatorServiceWorker& from(Navigator&);
     static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&);
-    static const char* supplementName();
+
+    virtual ~NavigatorServiceWorker();
 
     static ServiceWorkerContainer* serviceWorker(Navigator&);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit NavigatorServiceWorker(Navigator&);
     ServiceWorkerContainer* serviceWorker();
 
+    static const char* supplementName();
+
     // DOMWindowProperty override.
     virtual void willDetachGlobalObjectFromFrame() override;
 
-    PersistentWillBeMember<ServiceWorkerContainer> m_serviceWorker;
+    Member<ServiceWorkerContainer> m_serviceWorker;
 };
 
 } // namespace blink
 
 #endif // NavigatorServiceWorker_h