Revert of Enforce constant size and device scale factor for surfaces

android_webview/browser/test/rendering_test.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 "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #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"
 
 namespace android_webview {
 
 namespace {
 // BrowserViewRenderer subclass used for enabling tests to observe
 // OnParentDrawConstraintsUpdated.
 class TestBrowserViewRenderer : public BrowserViewRenderer {
  public:
@@ skipping 81 matching lines @@
 
 void RenderingTest::EndTest() {
   ui_task_runner_->PostTask(FROM_HERE, run_loop_.QuitWhenIdleClosure());
 }
 
 content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
   return browser_view_renderer_->GetActiveCompositorForTesting();
 }
 
 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());
   compositor_frame->render_pass_list.push_back(std::move(root_pass));
   return compositor_frame;
 }
 
 std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
     cc::ResourceId resource_id) {
   std::unique_ptr<cc::CompositorFrame> compositor_frame(ConstructEmptyFrame());
@@ skipping 26 matching lines @@
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview