Move some ResourceClients for testing to Oilpan heap

third_party/WebKit/Source/core/fetch/MockResourceClients.h

 /*
  * Copyright (c) 2013, 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 20 matching lines @@
 #ifndef MockResourceClients_h
 #define MockResourceClients_h
 
 #include "core/fetch/ImageResourceObserver.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceClient.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
-class MockResourceClient : public ResourceClient {
+class MockResourceClient : public GarbageCollectedFinalized<MockResourceClient>, public ResourceClient {
+    USING_PRE_FINALIZER(MockResourceClient, dispose);
 public:
     explicit MockResourceClient(Resource*);
     ~MockResourceClient() override;
 
     void notifyFinished(Resource*) override;
     String debugName() const override { return "MockResourceClient"; }
     virtual bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
 
     virtual void removeAsClient();
+    virtual void dispose();
+
+    DECLARE_TRACE();
 
 protected:
-    // TODO(Oilpan): properly trace when ResourceClient is on the heap.
-    UntracedMember<Resource> m_resource;
+    Member<Resource> m_resource;
     bool m_notifyFinishedCalled;
 };
 
 class MockImageResourceClient final : public MockResourceClient, public ImageResourceObserver {
 public:
     explicit MockImageResourceClient(ImageResource*);
     ~MockImageResourceClient() override;
 
     void imageNotifyFinished(ImageResource*) override;
     void imageChanged(ImageResource*, const IntRect*) override;
 
     String debugName() const override { return "MockImageResourceClient"; }
 
     bool notifyFinishedCalled() const override;
 
     void removeAsClient() override;
+    void dispose() override;
 
     int imageChangedCount() const { return m_imageChangedCount; }
 
 private:
     int m_imageChangedCount;
     int m_imageNotifyFinishedCount;
 };
 
 } // namespace blink
 
 #endif // MockResourceClients_h