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 /android_webview | |
| 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 'android_webview')
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 1 | ||||
| -rw-r--r-- | android_webview/lib/main/webview_tests.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index 0d7c28c..9fe47b1 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -120,6 +120,7 @@ '../testing/gtest.gyp:gtest', '../ui/base/ui_base.gyp:ui_base_jni_headers', '../ui/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl_test_support', 'android_webview_common', 'android_webview_unittests_jni', ], diff --git a/android_webview/lib/main/webview_tests.cc b/android_webview/lib/main/webview_tests.cc index ec849c8..38624f8 100644 --- a/android_webview/lib/main/webview_tests.cc +++ b/android_webview/lib/main/webview_tests.cc @@ -8,11 +8,12 @@ #include "base/test/test_suite.h" #include "content/public/common/content_switches.h" #include "ui/gl/gl_surface.h" +#include "ui/gl/test/gl_surface_test_support.h" int main(int argc, char** argv) { android_webview::RegisterJni(base::android::AttachCurrentThread()); base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kSingleProcess); - gfx::GLSurface::InitializeOneOffForTests(); + gfx::GLSurfaceTestSupport::InitializeOneOff(); return base::TestSuite(argc, argv).Run(); } |