Revert "Getting rid of DelegatedFrameData"

services/ui/ws/window_tree_client_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 2141 matching lines @@
 
   // Submit a CompositorFrame to window_2_101 and make sure server gets it.
   cc::mojom::MojoCompositorFrameSinkPtr surface_ptr;
   cc::mojom::MojoCompositorFrameSinkClientRequest client_request;
   cc::mojom::MojoCompositorFrameSinkClientPtr surface_client_ptr;
   client_request = mojo::GetProxy(&surface_client_ptr);
   wt2()->AttachCompositorFrameSink(
       window_2_101, mojom::CompositorFrameSinkType::DEFAULT,
       mojo::GetProxy(&surface_ptr), std::move(surface_client_ptr));
   cc::CompositorFrame compositor_frame;
+  compositor_frame.delegated_frame_data =
+      base::MakeUnique<cc::DelegatedFrameData>();
   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
   gfx::Rect frame_rect(0, 0, 100, 100);
   render_pass->SetNew(cc::RenderPassId(1, 1), frame_rect, frame_rect,
                       gfx::Transform());
-  compositor_frame.render_pass_list.push_back(std::move(render_pass));
+  compositor_frame.delegated_frame_data->render_pass_list.push_back(
+      std::move(render_pass));
   surface_ptr->SubmitCompositorFrame(std::move(compositor_frame));
   // Make sure the parent connection gets the surface ID.
   wt_client1()->WaitForChangeCount(1);
   // Verify that the submitted frame is for |window_2_101|.
   EXPECT_EQ(window_2_101_in_ws1,
             changes1()->back().surface_id.frame_sink_id().client_id());
 }
 
 // Verifies when an unknown window with a known child is added to a hierarchy
 // the known child is identified in the WindowData.
@@ skipping 34 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui