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

Unified Diff: trunk/src/gpu/command_buffer/common/unittest_main.cc

Issue 346573002: Revert 278059 "gpu: Add base class for gpu service tests" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « no previous file | trunk/src/gpu/command_buffer/service/buffer_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/gpu/command_buffer/common/unittest_main.cc
===================================================================
--- trunk/src/gpu/command_buffer/common/unittest_main.cc (revision 278063)
+++ trunk/src/gpu/command_buffer/common/unittest_main.cc (working copy)
@@ -9,6 +9,9 @@
#include "base/test/test_suite.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_mock.h"
+#include "ui/gl/gl_surface.h"
namespace {
@@ -17,6 +20,13 @@
NoAtExitBaseTestSuite(int argc, char** argv)
: base::TestSuite(argc, argv, false) {
}
+
+ virtual void Initialize() OVERRIDE {
+ base::TestSuite::Initialize();
+ gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
+ gfx::GLSurface::InitializeOneOffWithMockBindingsForTests();
+ gfx::GLSurface::InitializeDynamicMockBindingsForTests(NULL);
+ }
};
int RunTestSuite(int argc, char** argv) {
« no previous file with comments | « no previous file | trunk/src/gpu/command_buffer/service/buffer_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698