Rename LocalFrameId to LocalSurfaceId

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 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 "ui/compositor/layer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 1806 matching lines @@
   child->SetShowSolidColorContent();
   EXPECT_TRUE(child->cc_layer_for_testing());
   EXPECT_NE(before.get(), child->cc_layer_for_testing());
 }
 
 TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
   std::unique_ptr<Layer> layer(CreateLayer(LAYER_SOLID_COLOR));
 
   cc::SurfaceId surface_id(
       cc::FrameSinkId(0, 1),
-      cc::LocalFrameId(2, base::UnguessableToken::Create()));
+      cc::LocalSurfaceId(2, base::UnguessableToken::Create()));
   cc::SurfaceInfo surface_info(surface_id, 1.0f, gfx::Size(10, 10));
   layer->SetShowSurface(surface_info, new TestSurfaceReferenceFactory());
 
   const auto mirror = layer->Mirror();
   auto* const cc_layer = mirror->cc_layer_for_testing();
   const auto* surface = static_cast<cc::SurfaceLayer*>(cc_layer);
 
   // Mirroring preserves surface state.
   EXPECT_EQ(surface_info, surface->surface_info());
 
   surface_id =
       cc::SurfaceId(cc::FrameSinkId(1, 2),
-                    cc::LocalFrameId(3, base::UnguessableToken::Create()));
+                    cc::LocalSurfaceId(3, base::UnguessableToken::Create()));
   cc::SurfaceInfo surface_info_2(surface_id, 2.0f, gfx::Size(20, 20));
   layer->SetShowSurface(surface_info_2, new TestSurfaceReferenceFactory());
 
   // A new cc::Layer should be created for the mirror.
   EXPECT_NE(cc_layer, mirror->cc_layer_for_testing());
   surface = static_cast<cc::SurfaceLayer*>(mirror->cc_layer_for_testing());
 
   // Surface updates propagate to the mirror.
   EXPECT_EQ(surface_info_2, surface->surface_info());
 }
 
 // Test if frame size in dip is properly calculated in SetShowSurface
 TEST_F(LayerWithDelegateTest, FrameSizeInDip) {
   std::unique_ptr<Layer> layer(CreateLayer(LAYER_SOLID_COLOR));
 
   cc::SurfaceId surface_id(
       cc::FrameSinkId(0, 1),
-      cc::LocalFrameId(2, base::UnguessableToken::Create()));
+      cc::LocalSurfaceId(2, base::UnguessableToken::Create()));
 
   layer->SetShowSurface(cc::SurfaceInfo(surface_id, 2.0f, gfx::Size(30, 40)),
                         new TestSurfaceReferenceFactory());
 
   EXPECT_EQ(layer->frame_size_in_dip_for_testing(), gfx::Size(15, 20));
 }
 
 // Verifies that layer filters still attached after changing implementation
 // layer.
 TEST_F(LayerWithDelegateTest, LayerFiltersSurvival) {
@@ skipping 410 matching lines @@
   layer.set_name("foo");
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info =
       layer.TakeDebugInfo(nullptr);
   std::string trace_format("bar,");
   debug_info->AppendAsTraceFormat(&trace_format);
   std::string expected("bar,{\"layer_name\":\"foo\"}");
   EXPECT_EQ(expected, trace_format);
 }
 
 }  // namespace ui