Inject CanAddURLToHistory into TopSitesImpl

cc/layers/delegated_renderer_layer_impl.cc

 // Copyright 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 "cc/layers/delegated_renderer_layer_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 390 matching lines @@
                         force_anti_aliasing_off);
 
       SolidColorDrawQuad* right_quad =
           render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
       right_quad->SetNew(shared_quad_state, right, right,
                          colors[i % kNumColors], force_anti_aliasing_off);
     }
   }
 }
 
-// TODO(danakj): crbug.com/455931
-static ResourceProvider::ResourceId ValidateResource(
-    ResourceProvider* provider,
-    ResourceProvider::ResourceId id) {
-  provider->ValidateResource(id);
-  return id;
-}
-
 void DelegatedRendererLayerImpl::AppendRenderPassQuads(
     RenderPass* render_pass,
     const RenderPass* delegated_render_pass,
     const gfx::Size& frame_size) const {
   const SharedQuadState* delegated_shared_quad_state = nullptr;
   SharedQuadState* output_shared_quad_state = nullptr;
 
   gfx::Transform delegated_frame_to_target_transform = draw_transform();
   delegated_frame_to_target_transform.Scale(inverse_device_scale_factor_,
                                             inverse_device_scale_factor_);
@@ skipping 51 matching lines @@
         occlusion_in_quad_space.GetUnoccludedContentRect(
             delegated_quad->visible_rect);
 
     if (quad_visible_rect.IsEmpty())
       continue;
 
     if (delegated_quad->material != DrawQuad::RENDER_PASS) {
       DrawQuad* output_quad = render_pass->CopyFromAndAppendDrawQuad(
           delegated_quad, output_shared_quad_state);
       output_quad->visible_rect = quad_visible_rect;
-      // TODO(danakj): crbug.com/455931
-      output_quad->IterateResources(base::Bind(
-          &ValidateResource, layer_tree_impl()->resource_provider()));
+      ValidateQuadResources(output_quad);
     } else {
       RenderPassId delegated_contributing_render_pass_id =
           RenderPassDrawQuad::MaterialCast(delegated_quad)->render_pass_id;
       RenderPassId output_contributing_render_pass_id(-1, -1);
 
       bool present =
           ConvertDelegatedRenderPassId(delegated_contributing_render_pass_id,
                                        &output_contributing_render_pass_id);
       // |present| being false means the child compositor sent an invalid frame.
       DCHECK(present);
       DCHECK(output_contributing_render_pass_id != render_pass->id);
 
       RenderPassDrawQuad* output_quad =
           render_pass->CopyFromAndAppendRenderPassDrawQuad(
               RenderPassDrawQuad::MaterialCast(delegated_quad),
               output_shared_quad_state, output_contributing_render_pass_id);
       output_quad->visible_rect = quad_visible_rect;
-      // TODO(danakj): crbug.com/455931
-      output_quad->IterateResources(base::Bind(
-          &ValidateResource, layer_tree_impl()->resource_provider()));
+      ValidateQuadResources(output_quad);
     }
   }
 }
 
 const char* DelegatedRendererLayerImpl::LayerTypeAsString() const {
   return "cc::DelegatedRendererLayerImpl";
 }
 
 void DelegatedRendererLayerImpl::ClearChildId() {
   if (!child_id_)
     return;
 
   if (own_child_id_) {
     ResourceProvider* provider = layer_tree_impl()->resource_provider();
     provider->DestroyChild(child_id_);
   }
 
   resources_.clear();
   child_id_ = 0;
 }
 
 }  // namespace cc