Introduce cc::LocalFrameId and use in SurfaceFactory

content/test/test_render_view_host.cc

 // Copyright (c) 2012 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/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 52 matching lines @@
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
       is_showing_(false),
       is_occluded_(false),
       did_swap_compositor_frame_(false) {
 #if defined(OS_ANDROID)
   // 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
 
   rwh_->SetView(this);
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
   cc::SurfaceManager* manager = nullptr;
 #if defined(OS_ANDROID)
@@ skipping 255 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content