FrameGenerator should receive SurfaceInfo and use it in frame generation

services/ui/ws/frame_generator_unittest.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/test/test_message_loop.h"
@@ skipping 53 matching lines @@
   TestServerWindowDelegate window_delegate_;
   std::unique_ptr<ServerWindow> root_window_;
 
   // Needed so that Mojo classes can be initialized for ServerWindow use.
   base::TestMessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGeneratorTest);
 };
 
 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());
 }
 
 void FrameGeneratorTest::TearDown() {
   frame_generator_.reset();
   frame_generator_delegate_.reset();
 }
 
 // Tests correctness of the SharedQuadStateList generated by
@@ skipping 12 matching lines @@
 
   EXPECT_EQ(1u, quad_state_list->size());
   cc::SharedQuadState* root_sqs = quad_state_list->back();
   // Opacity should always be 1.
   EXPECT_EQ(1.0f, root_sqs->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui