Revert of Enforce constant size and device scale factor for surfaces

cc/test/test_compositor_frame_sink.h

 // Copyright 2016 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_TEST_COMPOSITOR_FRAME_SINK_H_
 #define CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame_sink.h"
@@ skipping 94 matching lines @@
   const bool disable_display_vsync_;
   const RendererSettings renderer_settings_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   FrameSinkId frame_sink_id_;
   // TODO(danakj): These don't need to be stored in unique_ptrs when
   // CompositorFrameSink is owned/destroyed on the compositor thread.
   std::unique_ptr<SurfaceManager> surface_manager_;
   std::unique_ptr<LocalSurfaceIdAllocator> local_surface_id_allocator_;
-  LocalSurfaceId local_surface_id_;
-  gfx::Size display_size_;
-  float device_scale_factor_ = 0;
+  LocalSurfaceId delegated_local_surface_id_;
 
   // Uses surface_manager_.
   std::unique_ptr<CompositorFrameSinkSupport> support_;
 
   std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source_;
   ExternalBeginFrameSource external_begin_frame_source_;
 
   // Uses surface_manager_ and begin_frame_source_.
   std::unique_ptr<Display> display_;
 
   TestCompositorFrameSinkClient* test_client_ = nullptr;
   gfx::Size enlarge_pass_texture_amount_;
 
   std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;
 
   base::WeakPtrFactory<TestCompositorFrameSink> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_