Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/inspector/NetworkResourcesData.h

Index: third_party/WebKit/Source/core/inspector/NetworkResourcesData.h
diff --git a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.h b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.h
index c4ee8b497a3320d0d20d5c2d5300440367dd8749..87a6696e34ece9ffa0a06538273f0aef513437e3 100644
--- a/third_party/WebKit/Source/core/inspector/NetworkResourcesData.h
+++ b/third_party/WebKit/Source/core/inspector/NetworkResourcesData.h
@@ -51,11 +51,11 @@ class SharedBuffer;
 class TextResourceDecoder;
 
 class XHRReplayData final
-    : public RefCountedWillBeGarbageCollectedFinalized<XHRReplayData>
+    : public GarbageCollectedFinalized<XHRReplayData>
     , public ContextLifecycleObserver {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(XHRReplayData);
+    USING_GARBAGE_COLLECTED_MIXIN(XHRReplayData);
 public:
-    static PassRefPtrWillBeRawPtr<XHRReplayData> create(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<EncodedFormData>, bool includeCredentials);
+    static RawPtr<XHRReplayData> create(ExecutionContext*, const AtomicString& method, const KURL&, bool async, PassRefPtr<EncodedFormData>, bool includeCredentials);
 
     void addHeader(const AtomicString& key, const AtomicString& value);
     const AtomicString& method() const { return m_method; }
@@ -78,11 +78,9 @@ private:
     bool m_includeCredentials;
 };
 
-class NetworkResourcesData final : public NoBaseWillBeGarbageCollectedFinalized<NetworkResourcesData> {
-    USING_FAST_MALLOC_WILL_BE_REMOVED(NetworkResourcesData);
+class NetworkResourcesData final : public GarbageCollectedFinalized<NetworkResourcesData> {
 public:
-    class ResourceData final : public NoBaseWillBeGarbageCollectedFinalized<ResourceData> {
-        USING_FAST_MALLOC_WILL_BE_REMOVED(ResourceData);
+    class ResourceData final : public GarbageCollectedFinalized<ResourceData> {
         friend class NetworkResourcesData;
     public:
         ResourceData(const String& requestId, const String& loaderId);
@@ -145,7 +143,7 @@ public:
         String m_frameId;
         KURL m_url;
         String m_content;
-        RefPtrWillBeMember<XHRReplayData> m_xhrReplayData;
+        Member<XHRReplayData> m_xhrReplayData;
         bool m_base64Encoded;
         RefPtr<SharedBuffer> m_dataBuffer;
         bool m_isContentEvicted;
@@ -157,13 +155,13 @@ public:
         OwnPtr<TextResourceDecoder> m_decoder;
 
         RefPtr<SharedBuffer> m_buffer;
-        RefPtrWillBeMember<Resource> m_cachedResource;
+        Member<Resource> m_cachedResource;
         RefPtr<BlobDataHandle> m_downloadedFileBlob;
     };
 
-    static PassOwnPtrWillBeRawPtr<NetworkResourcesData> create()
+    static RawPtr<NetworkResourcesData> create()
     {
-        return adoptPtrWillBeNoop(new NetworkResourcesData);
+        return (new NetworkResourcesData);
     }
     ~NetworkResourcesData();
 
@@ -182,7 +180,7 @@ public:
     void setResourcesDataSizeLimits(size_t maximumResourcesContentSize, size_t maximumSingleResourceContentSize);
     void setXHRReplayData(const String& requestId, XHRReplayData*);
     XHRReplayData* xhrReplayData(const String& requestId);
-    WillBeHeapVector<RawPtrWillBeMember<ResourceData>> resources();
+    HeapVector<Member<ResourceData>> resources();
 
     DECLARE_TRACE();
 private:
@@ -196,7 +194,7 @@ private:
 
     typedef HashMap<String, String> ReusedRequestIds;
     ReusedRequestIds m_reusedXHRReplayDataRequestIds;
-    typedef WillBeHeapHashMap<String, RawPtrWillBeMember<ResourceData>> ResourceDataMap;
+    typedef HeapHashMap<String, Member<ResourceData>> ResourceDataMap;
     ResourceDataMap m_requestIdToResourceDataMap;
     size_t m_contentSize;
     size_t m_maximumResourcesContentSize;