| Index: cc/test/layer_tree_pixel_test.cc
|
| diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
|
| index d0a5c59d4ec142509aaf169d42ebf90063754cf2..3ad33dc5937ada330ca72632f629c18d8205d49a 100644
|
| --- a/cc/test/layer_tree_pixel_test.cc
|
| +++ b/cc/test/layer_tree_pixel_test.cc
|
| @@ -223,9 +223,9 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
|
| return scoped_ptr<SkBitmap>();
|
|
|
| using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
|
| - scoped_ptr<WebKit::WebGraphicsContext3D> context3d(
|
| + scoped_ptr<blink::WebGraphicsContext3D> context3d(
|
| WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
|
| - WebKit::WebGraphicsContext3D::Attributes()));
|
| + blink::WebGraphicsContext3D::Attributes()));
|
|
|
| EXPECT_TRUE(context3d->makeContextCurrent());
|
|
|
| @@ -293,7 +293,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
|
| }
|
|
|
| void LayerTreePixelTest::ReleaseTextureMailbox(
|
| - scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
|
| + scoped_ptr<blink::WebGraphicsContext3D> context3d,
|
| uint32 texture,
|
| uint32 sync_point,
|
| bool lost_resource) {
|
| @@ -314,9 +314,9 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
|
| CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
|
|
|
| using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
|
| - scoped_ptr<WebKit::WebGraphicsContext3D> context3d(
|
| + scoped_ptr<blink::WebGraphicsContext3D> context3d(
|
| WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
|
| - WebKit::WebGraphicsContext3D::Attributes()));
|
| + blink::WebGraphicsContext3D::Attributes()));
|
|
|
| EXPECT_TRUE(context3d->makeContextCurrent());
|
|
|
|
|