Oilpan: Move MockActiveDOMObject to Oilpan's heap

Source/core/dom/ActiveDOMObjectTest.cpp

 /*
  * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 
 #include "core/dom/Document.h"
 #include "core/testing/DummyPageHolder.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
-class MockActiveDOMObject : public ActiveDOMObject {
+class MockActiveDOMObject final : public GarbageCollectedFinalized<MockActiveDOMObject>, public ActiveDOMObject {

[haraken, 2014/12/03 02:19:44]

At first, I wrote this as 'public GarbageCollected<MockActiveDOMObject>'. This
is wrong because ContextLifecycleObserver (which ActiveDOMObject derives) needs
a destructor, but the GC plugin didn't catch the error. Is it probably a bug of
the plugin?

[tkent, 2014/12/03 03:22:05]

I guess the reason is that MockActiveDOMObject is not in blink namespace.

 public:
-    MockActiveDOMObject(ExecutionContext* context) : ActiveDOMObject(context) { }
+    explicit MockActiveDOMObject(ExecutionContext* context) : ActiveDOMObject(context) { }
+
+    void trace(Visitor*) { }
 
     MOCK_METHOD0(suspend, void());
     MOCK_METHOD0(resume, void());
     MOCK_METHOD0(stop, void());
 };
 
 class ActiveDOMObjectTest : public ::testing::Test {
 protected:
     ActiveDOMObjectTest();
 
     Document& srcDocument() const { return m_srcPageHolder->document(); }
     Document& destDocument() const { return m_destPageHolder->document(); }
-    MockActiveDOMObject& activeDOMObject() { return m_activeDOMObject; }
+    MockActiveDOMObject& activeDOMObject() { return *m_activeDOMObject; }
 
 private:
     OwnPtr<DummyPageHolder> m_srcPageHolder;
     OwnPtr<DummyPageHolder> m_destPageHolder;
-    MockActiveDOMObject m_activeDOMObject;
+    Persistent<MockActiveDOMObject> m_activeDOMObject;
 };
 
 ActiveDOMObjectTest::ActiveDOMObjectTest()
     : m_srcPageHolder(DummyPageHolder::create(IntSize(800, 600)))
     , m_destPageHolder(DummyPageHolder::create(IntSize(800, 600)))
-    , m_activeDOMObject(&m_srcPageHolder->document())
+    , m_activeDOMObject(new MockActiveDOMObject(&m_srcPageHolder->document()))
 {
-    m_activeDOMObject.suspendIfNeeded();
+    m_activeDOMObject->suspendIfNeeded();
 }
 
 TEST_F(ActiveDOMObjectTest, NewContextObserved)
 {
     unsigned initialSrcCount = srcDocument().activeDOMObjectCount();
     unsigned initialDestCount = destDocument().activeDOMObjectCount();
 
     EXPECT_CALL(activeDOMObject(), resume());
     activeDOMObject().didMoveToNewExecutionContext(&destDocument());
 
@@ skipping 17 matching lines @@
 
 TEST_F(ActiveDOMObjectTest, MoveToStoppedDocument)
 {
     destDocument().detach();
 
     EXPECT_CALL(activeDOMObject(), stop());
     activeDOMObject().didMoveToNewExecutionContext(&destDocument());
 }
 
 } // unnamed namespace