Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass

cc/CCRenderSurfaceTest.cpp

Index: cc/CCRenderSurfaceTest.cpp
diff --git a/cc/CCRenderSurfaceTest.cpp b/cc/CCRenderSurfaceTest.cpp
index 65c87854487a0f040825cc58d5e0fa63da3ee7fd..cbba8912d94228df4478ba840740706a5aa6f86e 100644
--- a/cc/CCRenderSurfaceTest.cpp
+++ b/cc/CCRenderSurfaceTest.cpp
@@ -13,6 +13,7 @@
 #include "CCSingleThreadProxy.h"
 #include "MockCCQuadCuller.h"
 #include "cc/own_ptr_vector.h"
+#include "cc/scoped_ptr_vector.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
@@ -119,13 +120,12 @@ TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
 
 class TestCCRenderPassSink : public CCRenderPassSink {
 public:
-    virtual void appendRenderPass(PassOwnPtr<CCRenderPass> renderPass) OVERRIDE { m_renderPasses.append(renderPass); }
+    virtual void appendRenderPass(scoped_ptr<CCRenderPass> renderPass) OVERRIDE { m_renderPasses.append(renderPass.Pass()); }
 
-    const OwnPtrVector<CCRenderPass>& renderPasses() const { return m_renderPasses; }
+    const ScopedPtrVector<CCRenderPass>& renderPasses() const { return m_renderPasses; }
 
 private:
-    OwnPtrVector<CCRenderPass> m_renderPasses;
-
+    ScopedPtrVector<CCRenderPass> m_renderPasses;
 };
 
 TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)