Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass

cc/CCDelegatedRendererLayerImplTest.cpp

Index: cc/CCDelegatedRendererLayerImplTest.cpp
diff --git a/cc/CCDelegatedRendererLayerImplTest.cpp b/cc/CCDelegatedRendererLayerImplTest.cpp
index 71e1a0e21c10a88b710ef2194a0d0ee051209418..465bcac2b59e9e0c88704d4795bbf4ec61ae9180 100644
--- a/cc/CCDelegatedRendererLayerImplTest.cpp
+++ b/cc/CCDelegatedRendererLayerImplTest.cpp
@@ -18,6 +18,7 @@
 #include "FakeWebCompositorOutputSurface.h"
 #include "FakeWebGraphicsContext3D.h"
 #include "MockCCQuadCuller.h"
+#include "cc/scoped_ptr_vector.h"
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
@@ -64,11 +65,11 @@ protected:
     OwnPtr<CCLayerTreeHostImpl> m_hostImpl;
 };
 
-static CCTestRenderPass* addRenderPass(OwnPtrVector<CCRenderPass>& passList, CCRenderPass::Id id, IntRect outputRect, WebTransformationMatrix rootTransform)
+static CCTestRenderPass* addRenderPass(ScopedPtrVector<CCRenderPass>& passList, CCRenderPass::Id id, IntRect outputRect, WebTransformationMatrix rootTransform)
 {
-    OwnPtr<CCRenderPass> pass(CCRenderPass::create(id, outputRect, rootTransform));
+    scoped_ptr<CCRenderPass> pass(CCRenderPass::create(id, outputRect, rootTransform));
     CCTestRenderPass* testPass = static_cast<CCTestRenderPass*>(pass.get());
-    passList.append(pass.release());
+    passList.append(pass.Pass());
     return testPass;
 }
 
@@ -126,7 +127,7 @@ public:
         transform.translate(1, 1);
         delegatedRendererLayer->setTransform(transform);
 
-        OwnPtrVector<CCRenderPass> delegatedRenderPasses;
+        ScopedPtrVector<CCRenderPass> delegatedRenderPasses;
         CCTestRenderPass* pass1 = addRenderPass(delegatedRenderPasses, CCRenderPass::Id(9, 6), IntRect(6, 6, 6, 6), WebTransformationMatrix());
         addQuad(pass1, IntRect(0, 0, 6, 6), 33u);
         CCTestRenderPass* pass2 = addRenderPass(delegatedRenderPasses, CCRenderPass::Id(9, 7), IntRect(7, 7, 7, 7), WebTransformationMatrix());