diff options
| author | sadrul <sadrul@chromium.org> | 2015-07-20 15:34:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 22:35:29 +0000 |
| commit | ba162cdaf95c99b67da214be4cc8117db9ad2a5f (patch) | |
| tree | 814ef1c3c6d82f7193494ffece674371b68e8bfc /components/test | |
| parent | c2e5ab72a5cc817cdb86189670c9f535ed67bd4e (diff) | |
| download | chromium_src-ba162cdaf95c99b67da214be4cc8117db9ad2a5f.zip chromium_src-ba162cdaf95c99b67da214be4cc8117db9ad2a5f.tar.gz chromium_src-ba162cdaf95c99b67da214be4cc8117db9ad2a5f.tar.bz2 | |
gl/test: Move some initialization code used in tests to a separate component.
Moving test-code to a separete component, so that adding more test-only
dependencies does not affect non-test code.
BUG=none
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jam@ for non-ui/gl/ changes, since trivial #include/gyp-gn updates
Review URL: https://codereview.chromium.org/1238443004
Cr-Commit-Position: refs/heads/master@{#339539}
Diffstat (limited to 'components/test')
| -rw-r--r-- | components/test/DEPS | 2 | ||||
| -rw-r--r-- | components/test/run_all_unittests.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/test/DEPS b/components/test/DEPS index ad24217..265c5f7 100644 --- a/components/test/DEPS +++ b/components/test/DEPS @@ -19,5 +19,5 @@ include_rules = [ "+ui/base/resource/resource_bundle.h", "+ui/base/ui_base_paths.h", "+ui/gfx/android/gfx_jni_registrar.h", - "+ui/gl/gl_surface.h", # To initialize GL for tests. + "+ui/gl/test/gl_surface_test_support.h", # To initialize GL for tests. ] diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc index a24c284..fd327a1 100644 --- a/components/test/run_all_unittests.cc +++ b/components/test/run_all_unittests.cc @@ -17,7 +17,7 @@ #include "url/url_util.h" #if !defined(OS_IOS) -#include "ui/gl/gl_surface.h" +#include "ui/gl/test/gl_surface_test_support.h" #endif #if defined(OS_ANDROID) @@ -44,7 +44,7 @@ class ComponentsTestSuite : public base::TestSuite { base::StatisticsRecorder::Initialize(); #if !defined(OS_IOS) - gfx::GLSurface::InitializeOneOffForTests(); + gfx::GLSurfaceTestSupport::InitializeOneOff(); #endif #if defined(OS_ANDROID) // Register JNI bindings for android. |