3 files changed, 16 insertions, 9 deletions
diff --git a/cc/test/fake_delegated_renderer_layer.cc b/cc/test/fake_delegated_renderer_layer.cc
index 5b625a9..45518b3 100644
--- a/cc/test/fake_delegated_renderer_layer.cc
+++ b/cc/test/fake_delegated_renderer_layer.cc
@@ -9,8 +9,9 @@
 namespace cc {
 
 FakeDelegatedRendererLayer::FakeDelegatedRendererLayer(
-    DelegatedRendererLayerClient* client)
-    : DelegatedRendererLayer(client) {}
+    DelegatedRendererLayerClient* client,
+    DelegatedFrameProvider* frame_provider)
+    : DelegatedRendererLayer(client, frame_provider) {}
 
 FakeDelegatedRendererLayer::~FakeDelegatedRendererLayer() {}
 
diff --git a/cc/test/fake_delegated_renderer_layer.h b/cc/test/fake_delegated_renderer_layer.h
index d90d25f..e1ff6d5 100644
--- a/cc/test/fake_delegated_renderer_layer.h
+++ b/cc/test/fake_delegated_renderer_layer.h
@@ -12,15 +12,18 @@ namespace cc {
 class FakeDelegatedRendererLayer : public DelegatedRendererLayer {
  public:
   static scoped_refptr<FakeDelegatedRendererLayer> Create(
-      DelegatedRendererLayerClient* client) {
-    return make_scoped_refptr(new FakeDelegatedRendererLayer(client));
+      DelegatedRendererLayerClient* client,
+      DelegatedFrameProvider* frame_provider) {
+    return make_scoped_refptr(
+        new FakeDelegatedRendererLayer(client, frame_provider));
   }
 
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
 
  protected:
-  explicit FakeDelegatedRendererLayer(DelegatedRendererLayerClient* client);
+  explicit FakeDelegatedRendererLayer(DelegatedRendererLayerClient* client,
+                                      DelegatedFrameProvider* frame_provider);
   virtual ~FakeDelegatedRendererLayer();
 };
 
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc
index 14d8062..4057736 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.cc
+++ b/cc/test/fake_delegated_renderer_layer_impl.cc
@@ -8,6 +8,7 @@
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/resources/returned_resource.h"
+#include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
@@ -24,11 +25,12 @@ scoped_ptr<LayerImpl> FakeDelegatedRendererLayerImpl::CreateLayerImpl(
 }
 
 static ResourceProvider::ResourceId AddResourceToFrame(
+    ResourceProvider* resource_provider,
     DelegatedFrameData* frame,
     ResourceProvider::ResourceId resource_id) {
   TransferableResource resource;
   resource.id = resource_id;
-  resource.target = GL_TEXTURE_2D;
+  resource.target = resource_provider->TargetForTesting(resource_id);
   frame->resource_list.push_back(resource);
   return resource_id;
 }
@@ -50,9 +52,10 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
   scoped_ptr<DelegatedFrameData> delegated_frame(new DelegatedFrameData);
   delegated_frame->render_pass_list.swap(*pass_list);
 
+  ResourceProvider* resource_provider = layer_tree_impl()->resource_provider();
+
   DrawQuad::ResourceIteratorCallback add_resource_to_frame_callback =
-      base::Bind(&AddResourceToFrame,
-                 delegated_frame.get());
+      base::Bind(&AddResourceToFrame, resource_provider, delegated_frame.get());
   for (size_t i = 0; i < delegated_frame->render_pass_list.size(); ++i) {
     RenderPass* pass = delegated_frame->render_pass_list[i];
     for (size_t j = 0; j < pass->quad_list.size(); ++j)
@@ -60,7 +63,7 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
   }
 
   CreateChildIdIfNeeded(base::Bind(&NoopReturnCallback));
-  SetFrameData(delegated_frame.Pass(), gfx::RectF());
+  SetFrameData(delegated_frame.get(), gfx::RectF());
 }
 
 }  // namespace cc