Re-land: cc: Implement shared worker contexts.

cc/trees/layer_tree_impl_unittest.cc

Index: cc/trees/layer_tree_impl_unittest.cc
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 108ffbaee78b1f37a8124bdf18a6284dd84f297d..96d5c111394a5e79480962f622eae4d09f4206c6 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -22,12 +22,12 @@ namespace {
 
 class LayerTreeImplTest : public LayerTreeHostCommonTest {
  public:
-  LayerTreeImplTest() {
+  LayerTreeImplTest() : output_surface_(FakeOutputSurface::Create3d()) {
     LayerTreeSettings settings;
     settings.layer_transforms_should_scale_layer_contents = true;
     host_impl_.reset(new FakeLayerTreeHostImpl(
         settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_));
-    EXPECT_TRUE(host_impl_->InitializeRenderer(FakeOutputSurface::Create3d()));
+    EXPECT_TRUE(host_impl_->InitializeRenderer(output_surface_.get()));
   }
 
   FakeLayerTreeHostImpl& host_impl() { return *host_impl_; }
@@ -42,6 +42,7 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest {
   TestSharedBitmapManager shared_bitmap_manager_;
   TestTaskGraphRunner task_graph_runner_;
   FakeImplProxy proxy_;
+  scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<FakeLayerTreeHostImpl> host_impl_;
 };
 
@@ -97,10 +98,11 @@ TEST_F(LayerTreeImplTest, UpdateViewportAndHitTest) {
   FakeImplProxy proxy;
   LayerTreeSettings settings;
   settings.verify_property_trees = true;
+  scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();
   scoped_ptr<FakeLayerTreeHostImpl> host_impl;
   host_impl.reset(new FakeLayerTreeHostImpl(
       settings, &proxy, &shared_bitmap_manager, &task_graph_runner));
-  EXPECT_TRUE(host_impl->InitializeRenderer(FakeOutputSurface::Create3d()));
+  EXPECT_TRUE(host_impl->InitializeRenderer(output_surface.get()));
   scoped_ptr<LayerImpl> root =
       LayerImpl::Create(host_impl->active_tree(), 12345);