Oilpan: fix webkit unit tests following r356852.

third_party/WebKit/Source/core/dom/ScriptRunnerTest.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 "config.h"
 #include "core/dom/ScriptRunner.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ScriptLoader.h"
@@ skipping 86 matching lines @@
 class MockPlatform : public Platform, private WebScheduler {
 public:
     MockPlatform()
         : m_mockWebThread(this)
         , m_mockWebTaskRunner(&m_tasks)
     {
     }
 
     void cryptographicallyRandomValues(unsigned char* buffer, size_t length) override { }
 
+    const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName) override
+    {
+        static const unsigned char tracingIsDisabled = 0;
+        return &tracingIsDisabled;
+    }
+
     WebThread* currentThread() override { return &m_mockWebThread; }
 
     WebTaskRunner* loadingTaskRunner() override
     {
         return &m_mockWebTaskRunner;
     }
 
     WebTaskRunner* timerTaskRunner() override
     {
         ASSERT_NOT_REACHED();
@@ skipping 400 matching lines @@
 
     // At this moment all tasks can be already executed. Make sure that we do not crash here.
     m_scriptRunner->notifyScriptReady(scriptLoader2.get(), ScriptRunner::IN_ORDER_EXECUTION);
     m_platform.runAllTasks();
 
     EXPECT_THAT(m_order, ElementsAre(1, 2));
 }
 
 TEST_F(ScriptRunnerTest, TasksWithDeadScriptRunner)
 {
-    OwnPtrWillBeRawPtr<MockScriptLoader> scriptLoader1 = MockScriptLoader::create(m_element.get());
-    OwnPtrWillBeRawPtr<MockScriptLoader> scriptLoader2 = MockScriptLoader::create(m_element.get());
+    OwnPtrWillBePersistent<MockScriptLoader> scriptLoader1 = MockScriptLoader::create(m_element.get());
+    OwnPtrWillBePersistent<MockScriptLoader> scriptLoader2 = MockScriptLoader::create(m_element.get());
 
     EXPECT_CALL(*scriptLoader1, isReady()).WillRepeatedly(Return(true));
     EXPECT_CALL(*scriptLoader2, isReady()).WillRepeatedly(Return(true));
 
     m_scriptRunner->queueScriptForExecution(scriptLoader1.get(), ScriptRunner::ASYNC_EXECUTION);
     m_scriptRunner->queueScriptForExecution(scriptLoader2.get(), ScriptRunner::ASYNC_EXECUTION);
 
     m_scriptRunner->notifyScriptReady(scriptLoader1.get(), ScriptRunner::ASYNC_EXECUTION);
     m_scriptRunner->notifyScriptReady(scriptLoader2.get(), ScriptRunner::ASYNC_EXECUTION);
 
     m_scriptRunner.release();
 
+#if ENABLE(OILPAN)
+    Heap::collectAllGarbage();
+#endif
+
     // m_scriptRunner is gone. We need to make sure that ScriptRunner::Task do not access dead object.
     EXPECT_CALL(*scriptLoader1, execute()).Times(0);
     EXPECT_CALL(*scriptLoader2, execute()).Times(0);
 
     m_platform.runAllTasks();
 }
 
 } // namespace blink