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

Unified Diff: ui/gl/gpu_timing_unittest.cc

Issue 2629633003: Refactor GL bindings so there is no global GLApi or DriverGL. (Closed)
Patch Set: rebase Created 3 years, 11 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/gl_wgl_api_implementation.cc ('k') | ui/gl/init/gl_factory_android.cc » ('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 c895a7dbbf79acb67fbde2d2411b56c40d92fb9c..6fa9b06f7e1d46f4b844ebf8593735fbb9374e82 100644
--- a/ui/gl/gpu_timing_unittest.cc
+++ b/ui/gl/gpu_timing_unittest.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_context_stub_with_extensions.h"
+#include "ui/gl/gl_context_stub.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_mock.h"
#include "ui/gl/gl_surface_stub.h"
@@ -54,8 +54,8 @@ class GPUTimingTest : public testing::Test {
gl_.reset(new ::testing::StrictMock<MockGLInterface>());
MockGLInterface::SetGLInterface(gl_.get());
- context_ = new GLContextStubWithExtensions;
- context_->AddExtensionsString(gl_extensions);
+ context_ = new GLContextStub;
+ context_->SetExtensionsString(gl_extensions);
context_->SetGLVersionString(gl_version);
surface_ = new GLSurfaceStub;
context_->MakeCurrent(surface_.get());
@@ -81,7 +81,7 @@ class GPUTimingTest : public testing::Test {
bool setup_ = false;
bool cpu_time_bounded_ = false;
std::unique_ptr<::testing::StrictMock<MockGLInterface>> gl_;
- scoped_refptr<GLContextStubWithExtensions> context_;
+ scoped_refptr<GLContextStub> context_;
scoped_refptr<GLSurfaceStub> surface_;
GPUTimingFake gpu_timing_fake_queries_;
};
« no previous file with comments | « ui/gl/gl_wgl_api_implementation.cc ('k') | ui/gl/init/gl_factory_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698