diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 10:12:16 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 10:12:16 +0000 |
| commit | 55ad9fa127468950ed8511d4ac8a9cdf4c566da0 (patch) | |
| tree | b2f998fc2b1b11ca37e127fa75b7d46934ed2c58 /components/test | |
| parent | 0c4c26f89e1370672f501fd8d03f5a2e25ab5b9e (diff) | |
| download | chromium_src-55ad9fa127468950ed8511d4ac8a9cdf4c566da0.zip chromium_src-55ad9fa127468950ed8511d4ac8a9cdf4c566da0.tar.gz chromium_src-55ad9fa127468950ed8511d4ac8a9cdf4c566da0.tar.bz2 | |
components: Make components_unittests opt into real GL NullDraw contexts.
This breaks the dependency on the TestCompositor for
this test suite. Once it's no longer in use by any test
suite, we can remove it.
These tests don't compile in the compositor and ui/gl/ on IOS, so don't
initialize GL there.
R=jochen@chromium.org
BUG=270918
Review URL: https://codereview.chromium.org/175583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/test')
| -rw-r--r-- | components/test/DEPS | 1 | ||||
| -rw-r--r-- | components/test/run_all_unittests.cc | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/components/test/DEPS b/components/test/DEPS index f3e2ad7..64fea83 100644 --- a/components/test/DEPS +++ b/components/test/DEPS @@ -3,4 +3,5 @@ include_rules = [ "+ui/base/android/ui_base_jni_registrar.h", "+ui/base/resource/resource_bundle.h", "+ui/gfx/android/gfx_jni_registrar.h", + "+ui/gl/gl_surface.h", # To initialize GL for tests. ] diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc index b59285f..fbe1fd0 100644 --- a/components/test/run_all_unittests.cc +++ b/components/test/run_all_unittests.cc @@ -10,6 +10,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" +#if !defined(OS_IOS) +#include "ui/gl/gl_surface.h" +#endif + #if defined(OS_ANDROID) #include "base/android/jni_android.h" #include "ui/base/android/ui_base_jni_registrar.h" @@ -25,7 +29,9 @@ class ComponentsTestSuite : public base::TestSuite { private: virtual void Initialize() OVERRIDE { base::TestSuite::Initialize(); - +#if !defined(OS_IOS) + gfx::GLSurface::InitializeOneOffForTests(true); +#endif #if defined(OS_ANDROID) // Register JNI bindings for android. JNIEnv* env = base::android::AttachCurrentThread(); |