cc: Decouple LayerTreeTests from FakeOutputSurface expectations.

cc/test/layer_tree_test.h

 // 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.
 
 #ifndef CC_TEST_LAYER_TREE_TEST_H_
 #define CC_TEST_LAYER_TREE_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/animation/animation_delegate.h"
@@ skipping 130 matching lines @@
     return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
   }
   Proxy* remote_client_proxy() const;
   TaskRunnerProvider* task_runner_provider() const;
   TaskGraphRunner* task_graph_runner() const;
   bool TestEnded() const { return ended_; }
 
   LayerTreeHost* layer_tree_host();
   LayerTreeHost* remote_client_layer_tree_host();
   bool delegating_renderer() const { return delegating_renderer_; }
-  FakeOutputSurface* output_surface() { return output_surface_; }
   SharedBitmapManager* shared_bitmap_manager() const {
     return shared_bitmap_manager_.get();
   }
   TestGpuMemoryBufferManager* gpu_memory_buffer_manager() {
     return gpu_memory_buffer_manager_.get();
   }
 
   // Use these only for tests in threaded or remote mode.
   ProxyMainForTest* GetProxyMainForTest() const;
   ProxyImplForTest* GetProxyImplForTest() const;
 
   // Use this only for tests in threaded mode.
   ThreadedChannelForTest* GetThreadedChannelForTest() const;
 
   // Use this only for tests in remote mode.
   RemoteChannelImplForTest* GetRemoteChannelImplForTest() const;
 
   void DestroyLayerTreeHost();
   void DestroyRemoteClientHost() override;
 
   void CreateRemoteClientHost(
       const proto::CompositorMessageToImpl& proto) override;
 
   // By default, output surface recreation is synchronous.
   void RequestNewOutputSurface() override;
-  // Override this for pixel tests, where you need a real output surface.
+  // Override this for pixel tests, where you need a real output surface, or
+  // if you want to control the output surface used for drawing.
   virtual std::unique_ptr<OutputSurface> CreateOutputSurface();
-  // Override this for unit tests, which should not produce pixel output.
-  virtual std::unique_ptr<FakeOutputSurface> CreateFakeOutputSurface();
-
-  TestWebGraphicsContext3D* TestContext();
 
   bool IsRemoteTest() const;
 
   gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl);
 
  private:
   LayerTreeSettings settings_;
 
   CompositorMode mode_;
 
   std::unique_ptr<LayerTreeHostClientForTesting> client_;
   std::unique_ptr<LayerTreeHost> layer_tree_host_;
 
   // The LayerTreeHost created by the cc embedder on the client in remote mode.
   std::unique_ptr<LayerTreeHostForTesting> remote_client_layer_tree_host_;
 
-  FakeOutputSurface* output_surface_;
   FakeExternalBeginFrameSource* external_begin_frame_source_;
   RemoteProtoChannelBridge remote_proto_channel_bridge_;
 
   std::unique_ptr<ImageSerializationProcessor> image_serialization_processor_;
 
   bool beginning_;
   bool end_when_begin_returns_;
   bool timed_out_;
   bool scheduled_;
   bool started_;
@@ skipping 65 matching lines @@
 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
   SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
   SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
 
 // Some tests want to control when notify ready for activation occurs,
 // but this is not supported in the single-threaded case.
 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
   MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 #endif  // CC_TEST_LAYER_TREE_TEST_H_