Retain references to surfaces from both active AND pending CompositorFrames

content/test/content_browser_test_utils_internal.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/test/content_browser_test_utils_internal.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 306 matching lines @@
       break;
   }
 }
 
 bool SurfaceHitTestReadyNotifier::ContainsSurfaceId(
     cc::SurfaceId container_surface_id) {
   if (!container_surface_id.is_valid())
     return false;
   for (cc::SurfaceId id :
        surface_manager_->GetSurfaceForId(container_surface_id)
-           ->referenced_surfaces()) {
+           ->active_referenced_surfaces()) {
     if (id == target_view_->SurfaceIdForTesting() || ContainsSurfaceId(id))
       return true;
   }
   return false;
 }
 
 NavigationStallDelegate::NavigationStallDelegate(const GURL& url) : url_(url) {}
 
 void NavigationStallDelegate::RequestBeginning(
     net::URLRequest* request,
@@ skipping 54 matching lines @@
     NavigationHandle* navigation_handle) {
   if (navigation_handle->HasCommitted() &&
       !navigation_handle->IsErrorPage() &&
       navigation_handle->GetURL() == url_ &&
       navigation_handle->GetFrameTreeNodeId() == frame_tree_node_id_) {
     run_loop_.Quit();
   }
 }
 
 }  // namespace content