Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

content/test/test_render_view_host.h

Index: content/test/test_render_view_host.h
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 501685a1f1af5624f5566b4212ec379e61f2ecd1..4cf1a01bc1e98f838d9866fb118a7e4c9893e8be 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "build/build_config.h"
+#include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -129,6 +130,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
 
  protected:
   RenderWidgetHostImpl* rwh_;
+  cc::FrameSinkId frame_sink_id_;
 
  private:
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;