Remove static thread pointers from CC

webkit/compositor_bindings/web_layer_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 <public/WebLayer.h>
 
+#include "cc/thread.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "web_layer_impl.h"
+#include "web_layer_tree_view_impl.h"
 #include "web_layer_tree_view_test_common.h"
 #include <public/WebContentLayer.h>
 #include <public/WebContentLayerClient.h>
 #include <public/WebExternalTextureLayer.h>
 #include <public/WebFloatPoint.h>
 #include <public/WebFloatRect.h>
 #include <public/WebLayerScrollClient.h>
 #include <public/WebLayerTreeView.h>
 #include <public/WebLayerTreeViewClient.h>
 #include <public/WebRect.h>
@@ skipping 23 matching lines @@
 class WebLayerTest : public Test {
 public:
     WebLayerTest()
     {
     }
 
     virtual void SetUp()
     {
         m_rootLayer.reset(WebLayer::create());
         EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
-        m_view.reset(WebLayerTreeView::create(&m_client, *m_rootLayer, WebLayerTreeView::Settings()));
+        m_view.reset(new WebLayerTreeViewImpl(&m_client));
+        EXPECT_TRUE(m_view->initialize(WebLayerTreeView::Settings(), scoped_ptr<cc::Thread>(NULL)));
+        m_view->setRootLayer(*m_rootLayer);
         EXPECT_TRUE(m_view);
         Mock::VerifyAndClearExpectations(&m_client);
     }
 
     virtual void TearDown()
     {
         // We may get any number of scheduleComposite calls during shutdown.
         EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
         m_rootLayer.reset();
         m_view.reset();
     }
 
 protected:
     MockWebLayerTreeViewClient m_client;
     scoped_ptr<WebLayer> m_rootLayer;
-    scoped_ptr<WebLayerTreeView> m_view;
+    scoped_ptr<WebLayerTreeViewImpl> m_view;
 };
 
 // Tests that the client gets called to ask for a composite if we change the
 // fields.
 TEST_F(WebLayerTest, Client)
 {
     // Base layer.
     EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
     scoped_ptr<WebLayer> layer(WebLayer::create());
     layer->setDrawsContent(true);
@@ skipping 110 matching lines @@
     Mock::VerifyAndClearExpectations(&scrollClient);
 
     EXPECT_CALL(scrollClient, didScroll()).Times(0);
     m_rootLayer->setScrollPosition(WebPoint(14, 19));
     Mock::VerifyAndClearExpectations(&scrollClient);
 
     m_rootLayer->setScrollClient(0);
 }
 
 }