Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: gpu/command_buffer/service/gl_context_virtual_unittest.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gl_context_virtual_unittest.cc
diff --git a/gpu/command_buffer/service/gl_context_virtual_unittest.cc b/gpu/command_buffer/service/gl_context_virtual_unittest.cc
index d1e225cf2a6b70a601b64cf3f54178a4f9fe6a15..2da1a4ecaf65bc3c9ab36fdb99a7b62b72a4b890 100644
--- a/gpu/command_buffer/service/gl_context_virtual_unittest.cc
+++ b/gpu/command_buffer/service/gl_context_virtual_unittest.cc
@@ -39,21 +39,21 @@ TEST_F(GLContextVirtualTest, Reinitialize) {
.Times(AnyNumber())
.WillRepeatedly(Return(reinterpret_cast<unsigned const char *>("")));
{
- scoped_refptr<gfx::GLContextStub> base_context = new gfx::GLContextStub;
- gfx::GLShareGroup* share_group = base_context->share_group();
+ scoped_refptr<gl::GLContextStub> base_context = new gl::GLContextStub;
+ gl::GLShareGroup* share_group = base_context->share_group();
share_group->SetSharedContext(base_context.get());
scoped_refptr<GLContextVirtual> context(new GLContextVirtual(
share_group, base_context.get(), decoder_->AsWeakPtr()));
- EXPECT_TRUE(context->Initialize(GetGLSurface(), gfx::PreferIntegratedGpu));
+ EXPECT_TRUE(context->Initialize(GetGLSurface(), gl::PreferIntegratedGpu));
EXPECT_TRUE(context->MakeCurrent(GetGLSurface()));
}
{
- scoped_refptr<gfx::GLContextStub> base_context = new gfx::GLContextStub;
- gfx::GLShareGroup* share_group = base_context->share_group();
+ scoped_refptr<gl::GLContextStub> base_context = new gl::GLContextStub;
+ gl::GLShareGroup* share_group = base_context->share_group();
share_group->SetSharedContext(base_context.get());
scoped_refptr<GLContextVirtual> context(new GLContextVirtual(
share_group, base_context.get(), decoder_->AsWeakPtr()));
- EXPECT_TRUE(context->Initialize(GetGLSurface(), gfx::PreferIntegratedGpu));
+ EXPECT_TRUE(context->Initialize(GetGLSurface(), gl::PreferIntegratedGpu));
EXPECT_TRUE(context->MakeCurrent(GetGLSurface()));
}
}
« no previous file with comments | « gpu/command_buffer/service/gl_context_virtual.cc ('k') | gpu/command_buffer/service/gl_state_restorer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698