| 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 e5efae0e2cbd4f3621624cd331104b90e2980227..d20aa189bfa7d2ae6173dd4fcf2e436c5341697d 100644
|
| --- a/android_webview/browser/test/rendering_test.cc
|
| +++ b/android_webview/browser/test/rendering_test.cc
|
| @@ -16,6 +16,7 @@
|
| #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"
|
|
|
| @@ -117,9 +118,8 @@ content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
|
| }
|
|
|
| std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
|
| - std::unique_ptr<cc::CompositorFrame> compositor_frame(
|
| - new cc::CompositorFrame);
|
| - compositor_frame->metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true);
|
| + auto compositor_frame = base::MakeUnique<cc::CompositorFrame>(
|
| + cc::test::MakeEmptyCompositorFrame());
|
| 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());
|
|
|