| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index 09407f55ed78192066ed9f2d3f993d848b1ac935..31e392c148d40609e62ff6f81d4808448e49ea51 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -1558,7 +1558,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| RenderPassId root_pass_id(1, 0);
|
| TestRenderPass* root_pass;
|
|
|
| - ResourceProvider::ResourceId mask = resource_provider_->CreateResource(
|
| + ResourceId mask = resource_provider_->CreateResource(
|
| gfx::Size(20, 12), GL_CLAMP_TO_EDGE,
|
| ResourceProvider::TEXTURE_HINT_IMMUTABLE,
|
| resource_provider_->best_texture_format());
|
| @@ -2169,9 +2169,8 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
|
| mailbox.set_allow_overlay(true);
|
| scoped_ptr<SingleReleaseCallbackImpl> release_callback =
|
| SingleReleaseCallbackImpl::Create(base::Bind(&MailboxReleased));
|
| - ResourceProvider::ResourceId resource_id =
|
| - resource_provider->CreateResourceFromTextureMailbox(
|
| - mailbox, release_callback.Pass());
|
| + ResourceId resource_id = resource_provider->CreateResourceFromTextureMailbox(
|
| + mailbox, release_callback.Pass());
|
| bool premultiplied_alpha = false;
|
| bool flipped = false;
|
| bool nearest_neighbor = false;
|
| @@ -2296,9 +2295,8 @@ TEST_F(GLRendererTest, OverlaySyncPointsAreProcessed) {
|
| mailbox.set_allow_overlay(true);
|
| scoped_ptr<SingleReleaseCallbackImpl> release_callback =
|
| SingleReleaseCallbackImpl::Create(base::Bind(&MailboxReleased));
|
| - ResourceProvider::ResourceId resource_id =
|
| - resource_provider->CreateResourceFromTextureMailbox(
|
| - mailbox, release_callback.Pass());
|
| + ResourceId resource_id = resource_provider->CreateResourceFromTextureMailbox(
|
| + mailbox, release_callback.Pass());
|
| bool premultiplied_alpha = false;
|
| bool flipped = false;
|
| bool nearest_neighbor = false;
|
|
|