Revert of cc: Implement shared worker contexts.

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 970742b329dc45c1c268392cf8f6caa46067a2d6..1628c0c5c76f384b3554af4c6afd3f333ee047fb 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -93,7 +93,6 @@
  public:
   PictureLayerImplTest()
       : proxy_(base::ThreadTaskRunnerHandle::Get()),
-        output_surface_(FakeOutputSurface::Create3d()),
         host_impl_(LowResTilingsSettings(),
                    &proxy_,
                    &shared_bitmap_manager_,
@@ -108,7 +107,6 @@
 
   explicit PictureLayerImplTest(const LayerTreeSettings& settings)
       : proxy_(base::ThreadTaskRunnerHandle::Get()),
-        output_surface_(FakeOutputSurface::Create3d()),
         host_impl_(settings,
                    &proxy_,
                    &shared_bitmap_manager_,
@@ -123,7 +121,7 @@
   void SetUp() override { InitializeRenderer(); }
 
   virtual void InitializeRenderer() {
-    host_impl_.InitializeRenderer(output_surface_.get());
+    host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());
   }
 
   void SetupDefaultTrees(const gfx::Size& layer_bounds) {
@@ -361,7 +359,6 @@
   FakeImplProxy proxy_;
   TestSharedBitmapManager shared_bitmap_manager_;
   TestTaskGraphRunner task_graph_runner_;
-  scoped_ptr<OutputSurface> output_surface_;
   FakeLayerTreeHostImpl host_impl_;
   int root_id_;
   int id_;
@@ -1630,10 +1627,8 @@
       TestWebGraphicsContext3D::Create();
   context->set_max_texture_size(140);
   host_impl_.DidLoseOutputSurface();
-  scoped_ptr<OutputSurface> new_output_surface =
-      FakeOutputSurface::Create3d(context.Pass());
-  host_impl_.InitializeRenderer(new_output_surface.get());
-  output_surface_ = new_output_surface.Pass();
+  host_impl_.InitializeRenderer(
+      FakeOutputSurface::Create3d(context.Pass()).Pass());
 
   SetupDrawPropertiesAndUpdateTiles(pending_layer_, 1.f, 1.f, 1.f, 1.f, 0.f,
                                     false);
@@ -1677,10 +1672,8 @@
       TestWebGraphicsContext3D::Create();
   context->set_max_texture_size(140);
   host_impl_.DidLoseOutputSurface();
-  scoped_ptr<OutputSurface> new_output_surface =
-      FakeOutputSurface::Create3d(context.Pass());
-  host_impl_.InitializeRenderer(new_output_surface.get());
-  output_surface_ = new_output_surface.Pass();
+  host_impl_.InitializeRenderer(
+      FakeOutputSurface::Create3d(context.Pass()).Pass());
 
   SetupDrawPropertiesAndUpdateTiles(active_layer_, 1.f, 1.f, 1.f, 1.f, 0.f,
                                     false);
@@ -3932,12 +3925,10 @@
 
 class PictureLayerImplTestWithDelegatingRenderer : public PictureLayerImplTest {
  public:
-  PictureLayerImplTestWithDelegatingRenderer() : PictureLayerImplTest() {
-    output_surface_ = FakeOutputSurface::CreateDelegating3d();
-  }
+  PictureLayerImplTestWithDelegatingRenderer() : PictureLayerImplTest() {}
 
   void InitializeRenderer() override {
-    host_impl_.InitializeRenderer(output_surface_.get());
+    host_impl_.InitializeRenderer(FakeOutputSurface::CreateDelegating3d());
   }
 };