Introduce cc::LocalFrameId and use in SurfaceFactory

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 783b3d9ee446004bcb4dd80ebcbf858a73f632c1..80386b0e994a3b72b093726c6a4b538a1a3dc6fd 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -366,10 +366,12 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
     return GetDelegatedFrameHost()->SurfaceIdForTesting();
   }
 
-  bool HasFrameData() const {
-    return !surface_id().is_null();
+  const cc::LocalFrameId& GetLocalFrameId() const {
+    return GetDelegatedFrameHost()->LocalFrameIdForTesting();
   }
 
+  bool HasFrameData() const { return !GetLocalFrameId().is_null(); }
+
   bool released_front_lock_active() const {
     return GetDelegatedFrameHost()->ReleasedFrontLockActiveForTesting();
   }
@@ -2625,7 +2627,8 @@ class RenderWidgetHostViewAuraCopyRequestTest
     cc::SurfaceId surface_id =
         view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
     if (!surface_id.is_null())
-      view_->GetDelegatedFrameHost()->WillDrawSurface(surface_id, view_rect_);
+      view_->GetDelegatedFrameHost()->WillDrawSurface(
+          surface_id.local_frame_id(), view_rect_);
     ASSERT_TRUE(view_->last_copy_request_);
   }