Oilpan: fix build after r193963.

Source/core/html/canvas/CanvasRenderingContext2DTest.cpp

 // Copyright 2014 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/html/canvas/CanvasRenderingContext2D.h"
 
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLDocument.h"
@@ skipping 135 matching lines @@
 public:
     MockImageBufferSurfaceForOverwriteTesting(const IntSize& size, OpacityMode mode) : UnacceleratedImageBufferSurface(size, mode) { }
     virtual ~MockImageBufferSurfaceForOverwriteTesting() { }
     bool isRecording() const override { return true; } // otherwise overwrites are not tracked
 
     MOCK_METHOD0(willOverwriteCanvas, void());
 };
 
 //============================================================================
 
-class MockCanvasObserver : public CanvasObserver {
+class MockCanvasObserver : public NoBaseWillBeGarbageCollectedFinalized<MockCanvasObserver>, public CanvasObserver {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockCanvasObserver);
 public:
+    static PassOwnPtrWillBeRawPtr<MockCanvasObserver> create()
+    {
+        return adoptPtrWillBeNoop(new MockCanvasObserver);
+    }
+
     virtual ~MockCanvasObserver() { }
     MOCK_METHOD2(canvasChanged, void(HTMLCanvasElement*, const FloatRect&));
     MOCK_METHOD1(canvasResized, void(HTMLCanvasElement*));
 #if !ENABLE(OILPAN)
     void canvasDestroyed(HTMLCanvasElement*) override { };
 #endif
 };
 
 //============================================================================
 
@@ skipping 364 matching lines @@
     for (int i = 0; i < ExpensiveCanvasHeuristicParameters::ExpensiveRecordingStackDepth - 1; ++i) {
         context2d()->save();
         context2d()->translate(1.0f, 0.0f);
     }
     canvasElement().doDeferredPaintInvalidation(); // To close the current frame
 }
 
 TEST_F(CanvasRenderingContext2DTest, CanvasObserver)
 {
     createContext(NonOpaque);
-    MockCanvasObserver observer;
-    canvasElement().addObserver(&observer);
+    OwnPtrWillBeRawPtr<MockCanvasObserver> observer = MockCanvasObserver::create();
+    canvasElement().addObserver(observer.get());
 
     // The canvasChanged notification must be immediate, and not deferred until paint time
     // because offscreen canvases, which are not painted, also need to emit notifications.
-    EXPECT_CALL(observer, canvasChanged(&canvasElement(), FloatRect(0, 0, 1, 1))).Times(1);
+    EXPECT_CALL(*observer, canvasChanged(&canvasElement(), FloatRect(0, 0, 1, 1))).Times(1);
     context2d()->fillRect(0, 0, 1, 1);
-    Mock::VerifyAndClearExpectations(&observer);
+    Mock::VerifyAndClearExpectations(observer.get());
 
-    canvasElement().removeObserver(&observer);
+    canvasElement().removeObserver(observer.get());
 }
 
 } // unnamed namespace