Introduce cc::LocalFrameId and use in SurfaceFactory

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index d23784f6354093d8900a131c35e95f5a730f3a37..06692b20562502d41eac2597ede8121a60613ca0 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -70,16 +70,12 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
   // Not all tests initialize or need a context provider factory.
   if (ContextProviderFactoryImpl::GetInstance()) {
     frame_sink_id_ = AllocateFrameSinkId();
-    surface_id_allocator_ =
-        base::MakeUnique<cc::SurfaceIdAllocator>(frame_sink_id_);
     GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   }
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance()) {
     frame_sink_id_ = AllocateFrameSinkId();
-    surface_id_allocator_ =
-        base::MakeUnique<cc::SurfaceIdAllocator>(frame_sink_id_);
     GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   }
 #endif