RendererCompositorFrameSink should handle local surface id allocation

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 211 matching lines @@
   pass->SetNew(1, gfx::Rect(size), damage, gfx::Transform());
   frame.render_pass_list.push_back(std::move(pass));
   return frame;
 }
 }  // anonymous namespace
 
 TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
   float scale_factor = 1.f;
+  cc::LocalSurfaceId local_surface_id(1, base::UnguessableToken::Create());
 
   ASSERT_TRUE(browser_plugin_guest_);
 
   view_->SetSize(view_size);
   view_->Show();
 
   browser_plugin_guest_->set_attached(true);
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
+      0, local_surface_id,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
   cc::SurfaceId id = GetSurfaceId();
 
   EXPECT_TRUE(id.is_valid());
 
 #if !defined(OS_ANDROID)
   cc::SurfaceManager* manager = ImageTransportFactory::GetInstance()
                                     ->GetContextFactoryPrivate()
                                     ->GetSurfaceManager();
   cc::Surface* surface = manager->GetSurfaceForId(id);
   EXPECT_TRUE(surface);
   // There should be a SurfaceSequence created by the RWHVGuest.
   EXPECT_EQ(1u, surface->GetDestructionDependencyCount());
 #endif
   // Surface ID should have been passed to BrowserPluginGuest to
   // be sent to the embedding renderer.
   EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
             browser_plugin_guest_->last_surface_info_);
 
   browser_plugin_guest_->ResetTestData();
   browser_plugin_guest_->set_has_attached_since_surface_set(true);
 
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
+      0, local_surface_id,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
   // Since we have not changed the frame size and scale factor, the same surface
   // id must be used.
   DCHECK_EQ(id, GetSurfaceId());
 
 #if !defined(OS_ANDROID)
   surface = manager->GetSurfaceForId(id);
   EXPECT_TRUE(surface);
   // Another SurfaceSequence should be created by the RWHVGuest when sending
   // SurfaceInfo to the embedder.
   EXPECT_EQ(2u, surface->GetDestructionDependencyCount());
 #endif
   // Surface ID should have been passed to BrowserPluginGuest to
   // be sent to the embedding renderer.
   EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
             browser_plugin_guest_->last_surface_info_);
 
   browser_plugin_guest_->set_attached(false);
   browser_plugin_guest_->ResetTestData();
 
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
-
+      0, local_surface_id,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
   // Since guest is not attached, the CompositorFrame must be processed but the
   // frame must be evicted to return the resources immediately.
   EXPECT_FALSE(view_->has_frame());
 }
 
 }  // namespace content