Retain references to surfaces from both active AND pending CompositorFrames

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 1153 matching lines @@
 // TODO(wjmaclean): The next two functions are a modified version of
 // SurfaceHitTestReadyNotifier that (1) works for BrowserPlugin-based guests,
 // and (2) links outside of content-browsertests. At some point in time we
 // should probably merge these.
 namespace {
 
 bool ContainsSurfaceId(cc::SurfaceId container_surface_id,
                        RenderWidgetHostViewChildFrame* target_view) {
   if (!container_surface_id.is_valid())
     return false;
-  for (cc::SurfaceId id :
-       GetSurfaceManager()->GetSurfaceForId(container_surface_id)
-           ->referenced_surfaces()) {
+  for (cc::SurfaceId id : GetSurfaceManager()
+                              ->GetSurfaceForId(container_surface_id)
+                              ->active_referenced_surfaces()) {
     if (id == target_view->SurfaceIdForTesting() ||
         ContainsSurfaceId(id, target_view))
       return true;
   }
   return false;
 }
 
 }  // namespace
 
 void WaitForGuestSurfaceReady(content::WebContents* guest_web_contents) {
@@ skipping 663 matching lines @@
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       process->GetChannel(),
       FileSystemHostMsg_Write(request_id, file_path, blob_uuid, position));
 
   // If this started an async operation, wait for it to complete.
   if (waiter.did_start_update())
     waiter.WaitForEndUpdate();
 }
 
 }  // namespace content