Rename LocalFrameId to LocalSurfaceId

content/browser/frame_host/render_widget_host_view_guest_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 "content/browser/frame_host/render_widget_host_view_guest.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 189 matching lines @@
 #else
     ui::ContextProviderFactory::SetInstance(nullptr);
     ContextProviderFactoryImpl::Terminate();
 #endif
   }
 
   cc::SurfaceId GetSurfaceId() const {
     DCHECK(view_);
     RenderWidgetHostViewChildFrame* rwhvcf =
         static_cast<RenderWidgetHostViewChildFrame*>(view_);
-    if (!rwhvcf->local_frame_id_.is_valid())
+    if (!rwhvcf->local_surface_id_.is_valid())
       return cc::SurfaceId();
-    return cc::SurfaceId(rwhvcf->frame_sink_id_, rwhvcf->local_frame_id_);
+    return cc::SurfaceId(rwhvcf->frame_sink_id_, rwhvcf->local_surface_id_);
   }
 
  protected:
   TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
   BrowserPluginGuestDelegate browser_plugin_guest_delegate_;
   std::unique_ptr<TestWebContents> web_contents_;
   TestBrowserPluginGuest* browser_plugin_guest_;
 
@@ skipping 80 matching lines @@
 
   browser_plugin_guest_->set_attached(false);
   browser_plugin_guest_->ResetTestData();
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_FALSE(GetSurfaceId().is_valid());
 }
 
 }  // namespace content