Revert of Enforce constant size and device scale factor for surfaces

android_webview/browser/test/rendering_test.cc

Index: android_webview/browser/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index d20aa189bfa7d2ae6173dd4fcf2e436c5341697d..e5efae0e2cbd4f3621624cd331104b90e2980227 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -16,7 +16,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/compositor_frame.h"
-#include "cc/test/compositor_frame_helpers.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/test/test_synchronous_compositor_android.h"
 
@@ -118,8 +117,9 @@
 }
 
 std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
-  auto compositor_frame = base::MakeUnique<cc::CompositorFrame>(
-      cc::test::MakeEmptyCompositorFrame());
+  std::unique_ptr<cc::CompositorFrame> compositor_frame(
+      new cc::CompositorFrame);
+  compositor_frame->metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true);
   std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(1, viewport, viewport, gfx::Transform());