Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp

Index: third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp b/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
index 56f14af609edfd5335cb2adc6622ad9c58a54232..fa204c193e893697d04d07b883f34832a9adfe2e 100644
--- a/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
@@ -86,7 +86,7 @@ class GC_PLUGIN_IGNORE("crbug.com/513077") CallbackDispatcher final : public Bas
 public:
     typedef bool (Handler::*HandlingMethod)(Argument);
 
-    static CallbackDispatcher* create(PassRefPtrWillBeRawPtr<Handler> handler, HandlingMethod handlingMethod)
+    static CallbackDispatcher* create(RawPtr<Handler> handler, HandlingMethod handlingMethod)
     {
         return new CallbackDispatcher(handler, handlingMethod);
     }
@@ -103,11 +103,11 @@ public:
     }
 
 private:
-    CallbackDispatcher(PassRefPtrWillBeRawPtr<Handler> handler, HandlingMethod handlingMethod)
+    CallbackDispatcher(RawPtr<Handler> handler, HandlingMethod handlingMethod)
         : m_handler(handler)
         , m_handlingMethod(handlingMethod) { }
 
-    RefPtrWillBeMember<Handler> m_handler;
+    Member<Handler> m_handler;
     HandlingMethod m_handlingMethod;
 };
 
@@ -117,16 +117,16 @@ public:
     template<typename Handler, typename Argument>
     static CallbackDispatcher<BaseCallback, Handler, Argument>* create(Handler* handler, bool (Handler::*handlingMethod)(Argument))
     {
-        return CallbackDispatcher<BaseCallback, Handler, Argument>::create(PassRefPtrWillBeRawPtr<Handler>(handler), handlingMethod);
+        return CallbackDispatcher<BaseCallback, Handler, Argument>::create(RawPtr<Handler>(handler), handlingMethod);
     }
 };
 
-class FileSystemRootRequest final : public RefCountedWillBeGarbageCollectedFinalized<FileSystemRootRequest> {
+class FileSystemRootRequest final : public GarbageCollectedFinalized<FileSystemRootRequest> {
     WTF_MAKE_NONCOPYABLE(FileSystemRootRequest);
 public:
-    static PassRefPtrWillBeRawPtr<FileSystemRootRequest> create(PassRefPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
+    static RawPtr<FileSystemRootRequest> create(PassRefPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
     {
-        return adoptRefWillBeNoop(new FileSystemRootRequest(requestCallback, type));
+        return (new FileSystemRootRequest(requestCallback, type));
     }
 
     void start(ExecutionContext*);
@@ -190,12 +190,12 @@ bool FileSystemRootRequest::didGetEntry(Entry* entry)
     return true;
 }
 
-class DirectoryContentRequest final : public RefCountedWillBeGarbageCollectedFinalized<DirectoryContentRequest> {
+class DirectoryContentRequest final : public GarbageCollectedFinalized<DirectoryContentRequest> {
     WTF_MAKE_NONCOPYABLE(DirectoryContentRequest);
 public:
-    static PassRefPtrWillBeRawPtr<DirectoryContentRequest> create(PassRefPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
+    static RawPtr<DirectoryContentRequest> create(PassRefPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
     {
-        return adoptRefWillBeNoop(new DirectoryContentRequest(requestCallback, url));
+        return (new DirectoryContentRequest(requestCallback, url));
     }
 
     ~DirectoryContentRequest()
@@ -233,7 +233,7 @@ private:
     RefPtr<RequestDirectoryContentCallback> m_requestCallback;
     KURL m_url;
     RefPtr<Array<TypeBuilder::FileSystem::Entry>> m_entries;
-    PersistentWillBeMember<DirectoryReader> m_directoryReader;
+    Member<DirectoryReader> m_directoryReader;
 };
 
 void DirectoryContentRequest::start(ExecutionContext* executionContext)
@@ -318,12 +318,12 @@ bool DirectoryContentRequest::didReadDirectoryEntries(const EntryHeapVector& ent
     return true;
 }
 
-class MetadataRequest final : public RefCountedWillBeGarbageCollectedFinalized<MetadataRequest> {
+class MetadataRequest final : public GarbageCollectedFinalized<MetadataRequest> {
     WTF_MAKE_NONCOPYABLE(MetadataRequest);
 public:
-    static PassRefPtrWillBeRawPtr<MetadataRequest> create(PassRefPtr<RequestMetadataCallback> requestCallback, const String& url)
+    static RawPtr<MetadataRequest> create(PassRefPtr<RequestMetadataCallback> requestCallback, const String& url)
     {
-        return adoptRefWillBeNoop(new MetadataRequest(requestCallback, url));
+        return (new MetadataRequest(requestCallback, url));
     }
 
     ~MetadataRequest()
@@ -397,9 +397,9 @@ bool MetadataRequest::didGetMetadata(Metadata* metadata)
 class FileContentRequest final : public EventListener {
     WTF_MAKE_NONCOPYABLE(FileContentRequest);
 public:
-    static PassRefPtrWillBeRawPtr<FileContentRequest> create(PassRefPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
+    static RawPtr<FileContentRequest> create(PassRefPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
     {
-        return adoptRefWillBeNoop(new FileContentRequest(requestCallback, url, readAsText, start, end, charset));
+        return (new FileContentRequest(requestCallback, url, readAsText, start, end, charset));
     }
 
     ~FileContentRequest() override
@@ -460,7 +460,7 @@ private:
     String m_mimeType;
     String m_charset;
 
-    PersistentWillBeMember<FileReader> m_reader;
+    Member<FileReader> m_reader;
 };
 
 void FileContentRequest::start(ExecutionContext* executionContext)
@@ -525,11 +525,11 @@ void FileContentRequest::didRead()
     reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
 }
 
-class DeleteEntryRequest final : public RefCountedWillBeGarbageCollectedFinalized<DeleteEntryRequest> {
+class DeleteEntryRequest final : public GarbageCollectedFinalized<DeleteEntryRequest> {
 public:
-    static PassRefPtrWillBeRawPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url)
+    static RawPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url)
     {
-        return adoptRefWillBeNoop(new DeleteEntryRequest(requestCallback, url));
+        return (new DeleteEntryRequest(requestCallback, url));
     }
 
     ~DeleteEntryRequest()
@@ -546,7 +546,7 @@ private:
     // CallbackDispatcherFactory doesn't handle 0-arg handleEvent methods
     class VoidCallbackImpl final : public VoidCallback {
     public:
-        explicit VoidCallbackImpl(PassRefPtrWillBeRawPtr<DeleteEntryRequest> handler)
+        explicit VoidCallbackImpl(RawPtr<DeleteEntryRequest> handler)
             : m_handler(handler)
         {
         }
@@ -563,7 +563,7 @@ private:
         }
 
     private:
-        RefPtrWillBeMember<DeleteEntryRequest> m_handler;
+        Member<DeleteEntryRequest> m_handler;
     };
 
     bool didHitError(FileError* error)
@@ -634,9 +634,9 @@ bool DeleteEntryRequest::didDeleteEntry()
 } // anonymous namespace
 
 // static
-PassOwnPtrWillBeRawPtr<InspectorFileSystemAgent> InspectorFileSystemAgent::create(InspectedFrames* inspectedFrames)
+RawPtr<InspectorFileSystemAgent> InspectorFileSystemAgent::create(InspectedFrames* inspectedFrames)
 {
-    return adoptPtrWillBeNoop(new InspectorFileSystemAgent(inspectedFrames));
+    return (new InspectorFileSystemAgent(inspectedFrames));
 }
 
 InspectorFileSystemAgent::~InspectorFileSystemAgent()