Index: cc/surfaces/surface_aggregator_unittest.cc |
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc |
index 66ba6cf1248c6d52be4dc51a2784a83299630cc4..5173b9d61b6ec0e2ff3209cf75741752adce2b78 100644 |
--- a/cc/surfaces/surface_aggregator_unittest.cc |
+++ b/cc/surfaces/surface_aggregator_unittest.cc |
@@ -18,10 +18,10 @@ |
#include "cc/quads/surface_draw_quad.h" |
#include "cc/quads/texture_draw_quad.h" |
#include "cc/resources/shared_bitmap_manager.h" |
+#include "cc/surfaces/local_surface_id_allocator.h" |
#include "cc/surfaces/surface.h" |
#include "cc/surfaces/surface_factory.h" |
#include "cc/surfaces/surface_factory_client.h" |
-#include "cc/surfaces/surface_id_allocator.h" |
#include "cc/surfaces/surface_manager.h" |
#include "cc/test/fake_resource_provider.h" |
#include "cc/test/render_pass_test_utils.h" |
@@ -176,10 +176,10 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest { |
protected: |
LocalSurfaceId root_local_surface_id_; |
Surface* root_surface_; |
- SurfaceIdAllocator allocator_; |
+ LocalSurfaceIdAllocator allocator_; |
EmptySurfaceFactoryClient empty_child_client_; |
SurfaceFactory child_factory_; |
- SurfaceIdAllocator child_allocator_; |
+ LocalSurfaceIdAllocator child_allocator_; |
}; |
// Tests that a very simple frame containing only two solid color quads makes it |