cc: Get rid of non-delegated rendering in most cc unit tests.

cc/test/layer_tree_test.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 "cc/test/layer_tree_test.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 836 matching lines @@
 
 void LayerTreeTest::RequestNewOutputSurface() {
   if (settings_.use_external_begin_frame_source &&
       settings_.wait_for_beginframe_interval) {
     DCHECK(external_begin_frame_source_);
   }
   SetOutputSurfaceOnLayerTreeHost(CreateOutputSurface());
 }
 
 std::unique_ptr<OutputSurface> LayerTreeTest::CreateOutputSurface() {
-  return delegating_renderer_ ? FakeOutputSurface::CreateDelegating3d()
-                              : FakeOutputSurface::Create3d();
+  if (delegating_renderer_)
+    return FakeOutputSurface::CreateDelegating3d();
+
+  // Make a worker context in a non-delegating OutputSurface. This is an
+  // exceptional situation for these tests as they put a non-delegating
+  // OutputSurface into the LayerTreeHost.
+  return FakeOutputSurface::Create3d(TestContextProvider::Create(),
+                                     TestContextProvider::CreateWorker());
 }
 
 void LayerTreeTest::DestroyLayerTreeHost() {
   if (layer_tree_host_ && layer_tree_host_->root_layer())
     layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
   layer_tree_host_ = nullptr;
 
   DCHECK(!remote_proto_channel_bridge_.channel_main.HasReceiver());
 
   // Destroying the LayerTreeHost should destroy the remote client
@@ skipping 57 matching lines @@
 }
 
 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
   DCHECK(IsRemoteTest());
   DCHECK(task_runner_provider()->IsMainThread() ||
          task_runner_provider()->IsMainThreadBlocked());
   return remote_client_layer_tree_host_.get();
 }
 
 }  // namespace cc