Index: cc/output/gl_renderer_unittest.cc |
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc |
index 5f6bb283bbc5a42b4e1de57c4045baef265c786e..f5203616824533d78142c78a6db1549b53db73e9 100644 |
--- a/cc/output/gl_renderer_unittest.cc |
+++ b/cc/output/gl_renderer_unittest.cc |
@@ -248,7 +248,7 @@ class GLRendererTest : public testing::Test { |
virtual void SetUp() { renderer_.Initialize(); } |
- void SwapBuffers() { renderer_.SwapBuffers(LatencyInfo()); } |
+ void SwapBuffers() { renderer_.SwapBuffers(ui::LatencyInfo()); } |
FrameCountingMemoryAllocationSettingContext* Context() { |
return static_cast<FrameCountingMemoryAllocationSettingContext*>( |
@@ -1344,8 +1344,8 @@ class MockOutputSurface : public OutputSurface { |
MOCK_METHOD0(DiscardBackbuffer, void()); |
MOCK_METHOD1(Reshape, void(gfx::Size size)); |
MOCK_METHOD0(BindFramebuffer, void()); |
- MOCK_METHOD2(PostSubBuffer, void(gfx::Rect rect, const LatencyInfo&)); |
- MOCK_METHOD1(SwapBuffers, void(const LatencyInfo&)); |
+ MOCK_METHOD2(PostSubBuffer, void(gfx::Rect rect, const ui::LatencyInfo&)); |
+ MOCK_METHOD1(SwapBuffers, void(const ui::LatencyInfo&)); |
}; |
class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient { |
@@ -1356,7 +1356,7 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient { |
virtual void SetUp() { EXPECT_TRUE(renderer_.Initialize()); } |
- void SwapBuffers() { renderer_.SwapBuffers(LatencyInfo()); } |
+ void SwapBuffers() { renderer_.SwapBuffers(ui::LatencyInfo()); } |
void DrawFrame() { |
gfx::Rect viewport_rect(DeviceViewportSize()); |
@@ -1394,7 +1394,7 @@ TEST_F(MockOutputSurfaceTest, DrawFrameAndSwap) { |
DrawFrame(); |
EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1); |
- renderer_.SwapBuffers(LatencyInfo()); |
+ renderer_.SwapBuffers(ui::LatencyInfo()); |
} |
class MockOutputSurfaceTestWithPartialSwap : public MockOutputSurfaceTest { |
@@ -1410,7 +1410,7 @@ TEST_F(MockOutputSurfaceTestWithPartialSwap, DrawFrameAndSwap) { |
DrawFrame(); |
EXPECT_CALL(output_surface_, PostSubBuffer(_, _)).Times(1); |
- renderer_.SwapBuffers(LatencyInfo()); |
+ renderer_.SwapBuffers(ui::LatencyInfo()); |
} |
class MockOutputSurfaceTestWithSendCompositorFrame |