cc: Remove wtf includes from resource provider

cc/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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 "CCLayerTreeHostImpl.h"
 
 #include "CCDelegatedRendererLayerImpl.h"
 #include "CCHeadsUpDisplayLayerImpl.h"
@@ skipping 4002 matching lines @@
     EXPECT_TRUE(m_didRequestCommit);
 }
 
 struct RenderPassRemovalTestData : public CCLayerTreeHostImpl::FrameData {
     ScopedPtrHashMap<CCRenderPass::Id, CCRenderPass> renderPassCache;
     scoped_ptr<CCSharedQuadState> sharedQuadState;
 };
 
 class CCTestRenderer : public CCRendererGL, public CCRendererClient {
 public:
-    static PassOwnPtr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
+    static scoped_ptr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
     {
-        OwnPtr<CCTestRenderer> renderer(adoptPtr(new CCTestRenderer(resourceProvider)));
+        scoped_ptr<CCTestRenderer> renderer(new CCTestRenderer(resourceProvider));
         if (!renderer->initialize())
-            return nullptr;
+            return scoped_ptr<CCTestRenderer>();
 
-        return renderer.release();
+        return renderer.Pass();
     }
 
     void clearCachedTextures() { m_textures.clear(); }
     void setHaveCachedResourcesForRenderPassId(CCRenderPass::Id id) { m_textures.insert(id); }
 
     virtual bool haveCachedResourcesForRenderPassId(CCRenderPass::Id id) const OVERRIDE { return m_textures.count(id); }
 
     // CCRendererClient implementation.
     virtual const IntSize& deviceViewportSize() const OVERRIDE { return m_viewportSize; }
     virtual const CCLayerTreeSettings& settings() const OVERRIDE { return m_settings; }
@@ skipping 279 matching lines @@
 {
     char actualResult[1024];
     dumpRenderPassTestData(testData, actualResult);
     EXPECT_STREQ(testCase.expectedResult, actualResult) << "In test case: " << testCase.name;
 }
 
 TEST_P(CCLayerTreeHostImplTest, testRemoveRenderPasses)
 {
     scoped_ptr<CCGraphicsContext> context(createContext());
     ASSERT_TRUE(context->context3D());
-    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+    scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
 
-    OwnPtr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
+    scoped_ptr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
 
     int testCaseIndex = 0;
     while (removeRenderPassesCases[testCaseIndex].name) {
         RenderPassRemovalTestData testData;
         configureRenderPassTestData(removeRenderPassesCases[testCaseIndex].initScript, testData, renderer.get());
         CCLayerTreeHostImpl::removeRenderPasses(CCLayerTreeHostImpl::CullRenderPassesWithCachedTextures(*renderer), testData);
         verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testData);
         testCaseIndex++;
     }
 }
 
 INSTANTIATE_TEST_CASE_P(CCLayerTreeHostImplTests,
                         CCLayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
 } // namespace