Revert of Enforce constant size and device scale factor for surfaces

cc/test/test_compositor_frame_sink.cc

Index: cc/test/test_compositor_frame_sink.cc
diff --git a/cc/test/test_compositor_frame_sink.cc b/cc/test/test_compositor_frame_sink.cc
index 440b5d5adb66faba7ebc1d622c32ecaede253b90..32d4a816c7471bfdf04ef0f003af562f43a8c8e7 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -132,20 +132,17 @@
             frame.metadata.begin_frame_ack.sequence_number);
   test_client_->DisplayReceivedCompositorFrame(frame);
 
+  if (!delegated_local_surface_id_.is_valid()) {
+    delegated_local_surface_id_ = local_surface_id_allocator_->GenerateId();
+  }
+  display_->SetLocalSurfaceId(delegated_local_surface_id_,
+                              frame.metadata.device_scale_factor);
+
   gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
-  float device_scale_factor = frame.metadata.device_scale_factor;
-  if (!local_surface_id_.is_valid() || frame_size != display_size_ ||
-      device_scale_factor != device_scale_factor_) {
-    local_surface_id_ = local_surface_id_allocator_->GenerateId();
-    display_->SetLocalSurfaceId(local_surface_id_, device_scale_factor);
-    display_->Resize(frame_size);
-    display_size_ = frame_size;
-    device_scale_factor_ = device_scale_factor;
-  }
-
-  bool result =
-      support_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
-  DCHECK(result);
+  display_->Resize(frame_size);
+
+  support_->SubmitCompositorFrame(delegated_local_surface_id_,
+                                  std::move(frame));
 
   for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_) {
     support_->RequestCopyOfSurface(std::move(copy_request));