summaryrefslogtreecommitdiffstats
path: root/cc/test/cc_test_suite.cc
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 02:06:08 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 02:06:08 +0000
commit64437e622c11f77938e41b473bd77421ec2482e1 (patch)
tree09baeeb57cf7f5d40829051c1d75adb58c7e9393 /cc/test/cc_test_suite.cc
parentcb99348010b1e026f4ef4c0d242434731e497dca (diff)
downloadchromium_src-64437e622c11f77938e41b473bd77421ec2482e1.zip
chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.gz
chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.bz2
Revert 247793 "Ensure GL initialization only happens once, and p..."
due to new static initializers in gl_bindings_autogen_gl.cc > Ensure GL initialization only happens once, and provide common init path > > Currently tests initialize GL by calling into methods that should be > internal to the gl bindings code. Instead, everyone should go through > GLSurface::InitializeOneOff. > > Also GLSurface::InitializeOneOff early outs if it was already called, > leading to a pattern of initializing GL all over the place just in case > and not having a clear idea of where it should be set up. Instead, DCHECK > that it is not called more than once, and move calls to this method to > be during process startup for unit test suites instead of mid-test. > > This adds two test variants of InitializeOneOff for tests to call, that > set up OSMesa or Mock GL bindings, via GLSurface::InitializeOneOff. > > R=piman, sievers > BUG=270918 > > Review URL: https://codereview.chromium.org/135213003 TBR=danakj@chromium.org Review URL: https://codereview.chromium.org/149953003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/cc_test_suite.cc')
-rw-r--r--cc/test/cc_test_suite.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/test/cc_test_suite.cc b/cc/test/cc_test_suite.cc
index abe61cb..62b5430 100644
--- a/cc/test/cc_test_suite.cc
+++ b/cc/test/cc_test_suite.cc
@@ -7,7 +7,6 @@
#include "base/message_loop/message_loop.h"
#include "base/threading/thread_id_name_manager.h"
#include "cc/test/paths.h"
-#include "ui/gl/gl_surface.h"
namespace cc {
@@ -18,7 +17,6 @@ CCTestSuite::~CCTestSuite() {}
void CCTestSuite::Initialize() {
base::TestSuite::Initialize();
- gfx::GLSurface::InitializeOneOffForTests();
CCPaths::RegisterPathProvider();
message_loop_.reset(new base::MessageLoop);