Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ui/base/test/run_all_unittests.cc

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/test/run_all_unittests.cc
diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc
index 42156316e77c3251ee8425c7e4eee819572de581..ebd56657bd05e9dbc0ecf5226b3fbe258fe49eaa 100644
--- a/ui/base/test/run_all_unittests.cc
+++ b/ui/base/test/run_all_unittests.cc
@@ -10,6 +10,7 @@
#include "build/build_config.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/gl/gl_surface.h"
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
@@ -47,6 +48,13 @@ UIBaseTestSuite::UIBaseTestSuite(int argc, char** argv)
void UIBaseTestSuite::Initialize() {
base::TestSuite::Initialize();
+#if defined(OS_CHROMEOS)
+ // Needed for the tests in ui/chromeos.
+ // TODO(pkotwicz): Move the tests in ui/chromeos to their own test suite.
+ // (crbug.com/432538)
+ gfx::GLSurface::InitializeOneOffForTests();
+#endif
+
#if defined(OS_WIN)
gfx::InitDeviceScaleFactor(1.0);
#endif
« ui/base/BUILD.gn ('K') | « ui/base/DEPS ('k') | ui/base/ui_base_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698