FrameGenerator should receive SurfaceInfo and use it in frame generation

services/ui/ws/frame_generator_unittest.cc

Index: services/ui/ws/frame_generator_unittest.cc
diff --git a/services/ui/ws/frame_generator_unittest.cc b/services/ui/ws/frame_generator_unittest.cc
index bb30aa89bcccf3882ecd835b77354e652849ee03..27e2230384bb4c47e275b6db72451b1ecedf78cb 100644
--- a/services/ui/ws/frame_generator_unittest.cc
+++ b/services/ui/ws/frame_generator_unittest.cc
@@ -71,17 +71,20 @@ class FrameGeneratorTest : public testing::Test {
 };
 
 void FrameGeneratorTest::DrawWindow(cc::RenderPass* pass) {
-  frame_generator_->DrawWindow(pass, root_window_.get());
+  cc::SurfaceId surface_id(cc::FrameSinkId(5, 5),
+                           cc::LocalFrameId(1u, kArbitraryToken));
+  frame_generator_->window_manager_surface_info_ =
+      cc::SurfaceInfo(surface_id, 2, gfx::Size(2, 2));
+  frame_generator_->DrawWindow(pass);
 }
 
 void FrameGeneratorTest::SetUp() {
   testing::Test::SetUp();
-  frame_generator_delegate_ =
-      base::MakeUnique<TestFrameGeneratorDelegate>(root_window_.get());
+  frame_generator_delegate_ = base::MakeUnique<TestFrameGeneratorDelegate>();
   PlatformDisplayInitParams init_params;
   frame_generator_ = base::MakeUnique<FrameGenerator>(
       frame_generator_delegate_.get(), root_window_.get());
-  frame_generator_->set_device_scale_factor(
+  frame_generator_->SetDeviceScaleFactor(
       init_params.metrics.device_scale_factor);
   InitWindow(root_window());
 }