Rename LocalFrameId to LocalSurfaceId

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/memory/ptr_util.h"
@@ skipping 2156 matching lines @@
   client_request = mojo::MakeRequest(&surface_client_ptr);
   wt2()->AttachCompositorFrameSink(window_2_101,
                                    mojo::MakeRequest(&surface_ptr),
                                    std::move(surface_client_ptr));
   cc::CompositorFrame compositor_frame;
   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
   gfx::Rect frame_rect(0, 0, 100, 100);
   render_pass->SetNew(1, frame_rect, frame_rect, gfx::Transform());
   compositor_frame.render_pass_list.push_back(std::move(render_pass));
   compositor_frame.metadata.device_scale_factor = 1.f;
-  cc::LocalFrameId local_frame_id(1, base::UnguessableToken::Create());
-  surface_ptr->SubmitCompositorFrame(local_frame_id,
+  cc::LocalSurfaceId local_surface_id(1, base::UnguessableToken::Create());
+  surface_ptr->SubmitCompositorFrame(local_surface_id,
                                      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