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

Unified Diff: ui/gl/gpu_timing_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
« no previous file with comments | « ui/gl/gpu_timing_fake.cc ('k') | ui/gl/init/gl_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gpu_timing_unittest.cc
diff --git a/ui/gl/gpu_timing_unittest.cc b/ui/gl/gpu_timing_unittest.cc
index f508c6562b7eec7fed6f4a6402b20716477e1298..9a2f56aeb22be92f094af2bba825f2430258bfd3 100644
--- a/ui/gl/gpu_timing_unittest.cc
+++ b/ui/gl/gpu_timing_unittest.cc
@@ -18,7 +18,7 @@
#include "ui/gl/gpu_timing_fake.h"
#include "ui/gl/test/gl_surface_test_support.h"
-namespace gfx {
+namespace gl {
using ::testing::Exactly;
using ::testing::NotNull;
@@ -38,7 +38,7 @@ class GPUTimingTest : public testing::Test {
surface_ = nullptr;
if (setup_) {
MockGLInterface::SetGLInterface(NULL);
- gfx::ClearGLBindings();
+ gl::ClearGLBindings();
}
setup_ = false;
cpu_time_bounded_ = false;
@@ -56,7 +56,7 @@ class GPUTimingTest : public testing::Test {
context_ = new GLContextStubWithExtensions;
context_->AddExtensionsString(gl_extensions);
context_->SetGLVersionString(gl_version);
- surface_ = new gfx::GLSurfaceStub;
+ surface_ = new gl::GLSurfaceStub;
context_->MakeCurrent(surface_.get());
gpu_timing_fake_queries_.Reset();
GLSurfaceTestSupport::InitializeDynamicMockBindings(context_.get());
@@ -82,7 +82,7 @@ class GPUTimingTest : public testing::Test {
bool cpu_time_bounded_ = false;
std::unique_ptr<::testing::StrictMock<MockGLInterface>> gl_;
scoped_refptr<GLContextStubWithExtensions> context_;
- scoped_refptr<gfx::GLSurfaceStub> surface_;
+ scoped_refptr<gl::GLSurfaceStub> surface_;
GPUTimingFake gpu_timing_fake_queries_;
};
« no previous file with comments | « ui/gl/gpu_timing_fake.cc ('k') | ui/gl/init/gl_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698