Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/ScriptRunner.cpp

Index: third_party/WebKit/Source/core/dom/ScriptRunner.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptRunner.cpp b/third_party/WebKit/Source/core/dom/ScriptRunner.cpp
index c10c779a8dbf1a00c9c7e3f6b24e302c87fd7726..c6cd78737e1cb642117c6442d367de55a662e503 100644
--- a/third_party/WebKit/Source/core/dom/ScriptRunner.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptRunner.cpp
@@ -63,7 +63,7 @@ class ScriptRunner::Task : public WebTaskRunner::Task {
     WTF_MAKE_NONCOPYABLE(Task);
 
 public:
-    explicit Task(WeakPtrWillBeRawPtr<ScriptRunner> scriptRunner)
+    explicit Task(RawPtr<ScriptRunner> scriptRunner)
         : m_scriptRunner(scriptRunner)
     {
     }
@@ -78,7 +78,7 @@ public:
     }
 
 private:
-    WeakPtrWillBeWeakPersistent<ScriptRunner> m_scriptRunner;
+    WeakPersistent<ScriptRunner> m_scriptRunner;
 };
 
 #if !ENABLE(OILPAN)
@@ -122,7 +122,7 @@ void ScriptRunner::queueScriptForExecution(ScriptLoader* scriptLoader, Execution
 void ScriptRunner::postTask(const WebTraceLocation& webTraceLocation)
 {
     // TODO(altimin): Replace all this with `new Task(this)` when Oilpan is here.
-    WeakPtrWillBeRawPtr<ScriptRunner> scriptRunnerForTask;
+    RawPtr<ScriptRunner> scriptRunnerForTask;
 #if !ENABLE(OILPAN)
     scriptRunnerForTask = m_weakPointerFactoryForTasks.createWeakPtr();
 #else
@@ -229,7 +229,7 @@ void ScriptRunner::notifyScriptLoadError(ScriptLoader* scriptLoader, ExecutionTy
 
 void ScriptRunner::movePendingScript(Document& oldDocument, Document& newDocument, ScriptLoader* scriptLoader)
 {
-    RefPtrWillBeRawPtr<Document> newContextDocument = newDocument.contextDocument().get();
+    RawPtr<Document> newContextDocument = newDocument.contextDocument().get();
     if (!newContextDocument) {
         // Document's contextDocument() method will return no Document if the
         // following conditions both hold:
@@ -244,7 +244,7 @@ void ScriptRunner::movePendingScript(Document& oldDocument, Document& newDocumen
         ASSERT(!newDocument.frame());
         newContextDocument = &newDocument;
     }
-    RefPtrWillBeRawPtr<Document> oldContextDocument = oldDocument.contextDocument().get();
+    RawPtr<Document> oldContextDocument = oldDocument.contextDocument().get();
     if (!oldContextDocument) {
         ASSERT(!oldDocument.frame());
         oldContextDocument = &oldDocument;
@@ -268,7 +268,7 @@ void ScriptRunner::movePendingScript(ScriptRunner* newRunner, ScriptLoader* scri
 }
 
 // Returns true if task was run, and false otherwise.
-bool ScriptRunner::executeTaskFromQueue(WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>>* taskQueue)
+bool ScriptRunner::executeTaskFromQueue(HeapDeque<Member<ScriptLoader>>* taskQueue)
 {
     if (taskQueue->isEmpty())
         return false;