Mus+Ash: Towards Unifying CompositorFrameSink terminology

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 2128 matching lines @@
   const Id window_2_101 = wt_client2()->NewWindow(101);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_100_in_ws2, window_2_101));
   const Id window_2_101_in_ws1 = BuildWindowId(client_id_2(), 1);
   wt_client1()->WaitForChangeCount(1);
   EXPECT_EQ("HierarchyChanged window=" + IdToString(window_2_101_in_ws1) +
                 " old_parent=null new_parent=" + IdToString(window_1_100),
             SingleChangeToDescription(*changes1()));
   changes1()->clear();
 
   // Submit a CompositorFrame to window_2_101 and make sure server gets it.
-  mojom::SurfacePtr surface_ptr;
-  mojom::SurfaceClientRequest client_request;
-  mojom::SurfaceClientPtr surface_client_ptr;
+  cc::mojom::MojoCompositorFrameSinkPtr surface_ptr;
+  cc::mojom::MojoCompositorFrameSinkClientRequest client_request;
+  cc::mojom::MojoCompositorFrameSinkClientPtr surface_client_ptr;
   client_request = mojo::GetProxy(&surface_client_ptr);
   wt2()->AttachSurface(window_2_101, mojom::SurfaceType::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.delegated_frame_data->render_pass_list.push_back(
       std::move(render_pass));
-  surface_ptr->SubmitCompositorFrame(std::move(compositor_frame),
-                                     base::Closure());
+  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());
 }
 
 // TODO(sky): need to better track changes to initial client. For example,
 // that SetBounsdWindows/AddWindow and the like don't result in messages to the
 // originating client.
 
 // 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