Rename LocalFrameId to LocalSurfaceId

content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc

 // Copyright (c) 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 "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/renderer_host/offscreen_canvas_surface_impl.h"
 #include "content/browser/renderer_host/offscreen_canvas_surface_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 54 matching lines @@
 #endif
 }
 
 // This test mimics the workflow of OffscreenCanvas.commit() on renderer
 // process.
 TEST_F(OffscreenCanvasSurfaceManagerTest,
        SingleHTMLCanvasElementTransferToOffscreen) {
   blink::mojom::OffscreenCanvasSurfaceClientPtr client;
   cc::FrameSinkId frame_sink_id(3, 3);
   cc::SurfaceIdAllocator surface_id_allocator;
-  cc::LocalFrameId current_local_frame_id(surface_id_allocator.GenerateId());
+  cc::LocalSurfaceId current_local_surface_id(
+      surface_id_allocator.GenerateId());
 
   auto surface_impl = base::WrapUnique(
       new OffscreenCanvasSurfaceImpl(frame_sink_id, std::move(client)));
   EXPECT_EQ(1, this->getNumSurfaceImplInstances());
   EXPECT_EQ(surface_impl.get(),
             OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
                 frame_sink_id));
 
-  this->OnSurfaceCreated(cc::SurfaceId(frame_sink_id, current_local_frame_id));
-  EXPECT_EQ(current_local_frame_id, surface_impl->current_local_frame_id());
+  this->OnSurfaceCreated(
+      cc::SurfaceId(frame_sink_id, current_local_surface_id));
+  EXPECT_EQ(current_local_surface_id, surface_impl->current_local_surface_id());
 
   surface_impl = nullptr;
   EXPECT_EQ(0, this->getNumSurfaceImplInstances());
 }
 
 TEST_F(OffscreenCanvasSurfaceManagerTest,
        MultiHTMLCanvasElementTransferToOffscreen) {
   blink::mojom::OffscreenCanvasSurfaceClientPtr client_a;
   cc::FrameSinkId frame_sink_id_a(3, 3);
   cc::SurfaceIdAllocator surface_id_allocator;
@@ skipping 14 matching lines @@
             OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
                 frame_sink_id_b));
 
   surface_impl_a = nullptr;
   EXPECT_EQ(1, this->getNumSurfaceImplInstances());
   surface_impl_b = nullptr;
   EXPECT_EQ(0, this->getNumSurfaceImplInstances());
 }
 
 }  // namespace content