diff options
| -rw-r--r-- | ui/app_list/test/DEPS | 3 | ||||
| -rw-r--r-- | ui/app_list/test/run_all_unittests.cc | 7 | ||||
| -rw-r--r-- | ui/message_center/test/DEPS | 3 | ||||
| -rw-r--r-- | ui/message_center/test/run_all_unittests.cc | 7 |
4 files changed, 20 insertions, 0 deletions
diff --git a/ui/app_list/test/DEPS b/ui/app_list/test/DEPS new file mode 100644 index 0000000..8d1340d --- /dev/null +++ b/ui/app_list/test/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+ui/gl/gl_surface.h", # To initialize GL for tests. +] diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc index 6887f43..c10b376 100644 --- a/ui/app_list/test/run_all_unittests.cc +++ b/ui/app_list/test/run_all_unittests.cc @@ -11,6 +11,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#if !defined(OS_MACOSX) +#include "ui/gl/gl_surface.h" +#endif + namespace { class AppListTestSuite : public base::TestSuite { @@ -19,6 +23,9 @@ class AppListTestSuite : public base::TestSuite { protected: virtual void Initialize() OVERRIDE { +#if !defined(OS_MACOSX) + gfx::GLSurface::InitializeOneOffForTests(true); +#endif base::TestSuite::Initialize(); ui::RegisterPathProvider(); diff --git a/ui/message_center/test/DEPS b/ui/message_center/test/DEPS new file mode 100644 index 0000000..8d1340d --- /dev/null +++ b/ui/message_center/test/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+ui/gl/gl_surface.h", # To initialize GL for tests. +] diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc index 094e128..64e408b 100644 --- a/ui/message_center/test/run_all_unittests.cc +++ b/ui/message_center/test/run_all_unittests.cc @@ -11,6 +11,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#if !defined(OS_MACOSX) +#include "ui/gl/gl_surface.h" +#endif + namespace { class MessageCenterTestSuite : public base::TestSuite { @@ -19,6 +23,9 @@ class MessageCenterTestSuite : public base::TestSuite { protected: virtual void Initialize() OVERRIDE { +#if !defined(OS_MACOSX) + gfx::GLSurface::InitializeOneOffForTests(true); +#endif base::TestSuite::Initialize(); ui::RegisterPathProvider(); |