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

cc/layers/surface_layer_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 11 matching lines @@
 #include "cc/trees/layer_tree_host.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 static constexpr uint32_t kArbitraryClientId = 0;
 
 class SurfaceLayerTest : public testing::Test {
- public:
-  SurfaceLayerTest()
-      : fake_client_(
-            FakeLayerTreeHostClient(FakeLayerTreeHostClient::DIRECT_3D)) {}
-
  protected:
   void SetUp() override {
     layer_tree_host_ =
         FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
     layer_tree_host_->SetViewportSize(gfx::Size(10, 10));
   }
 
   void TearDown() override {
     if (layer_tree_host_) {
       layer_tree_host_->SetRootLayer(nullptr);
@@ skipping 128 matching lines @@
   SurfaceId required_id_;
   std::set<SurfaceSequence> required_set_;
 };
 
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
  public:
   SurfaceLayerSwapPromiseWithDraw() : SurfaceLayerSwapPromise() {}
 
   std::unique_ptr<OutputSurface> CreateOutputSurface() override {
-    auto ret = delegating_renderer() ? FakeOutputSurface::CreateDelegating3d()
-                                     : FakeOutputSurface::Create3d();
+    auto ret = FakeOutputSurface::CreateDelegating3d();
     output_surface_ = ret.get();
     return std::move(ret);
   }
 
   void ChangeTree() override {
     ++commit_count_;
     switch (commit_count_) {
       case 1:
         // Remove SurfaceLayer from tree to cause SwapPromise to be created.
         layer_tree_host()->SetRootLayer(blank_layer_);
@@ skipping 25 matching lines @@
     EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryClientId, 1, 0));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied through Swap, not with the
     // callback.
     EXPECT_TRUE(satisfied_sequence_.is_null());
   }
 
   FakeOutputSurface* output_surface_;
 };
 
-// TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
-// fixed.
-MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithDraw);
+SINGLE_AND_MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithDraw);
 
 // Check that SurfaceSequence is sent through swap promise and resolved when
 // swap fails.
 class SurfaceLayerSwapPromiseWithoutDraw : public SurfaceLayerSwapPromise {
  public:
   SurfaceLayerSwapPromiseWithoutDraw() : SurfaceLayerSwapPromise() {}
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame,
                                    DrawResult draw_result) override {
@@ skipping 21 matching lines @@
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied with the callback.
     EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u));
   }
 };
 
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
 
 }  // namespace
 }  // namespace cc