Index: chrome/test/base/interactive_ui_tests_main.cc |
diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc |
index c6258dc393b65111c947c0339f807621d9d799cb..d0846382c0f535511b29888b0a1b32aff8403b1c 100644 |
--- a/chrome/test/base/interactive_ui_tests_main.cc |
+++ b/chrome/test/base/interactive_ui_tests_main.cc |
@@ -13,7 +13,7 @@ |
#if defined(USE_AURA) |
#include "ui/aura/test/ui_controls_factory_aura.h" |
#include "ui/base/test/ui_controls_aura.h" |
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) |
#include "ui/views/test/ui_controls_factory_desktop_aurax11.h" |
#endif |
#endif |
@@ -49,13 +49,17 @@ class InteractiveUITestSuite : public ChromeTestSuite { |
#endif |
#if defined(OS_LINUX) |
rjkroege
2016/11/07 19:54:15
Does OS_CHROMEOS never imply OS_LINUX? It use to i
Tom (Use chromium acct)
2016/11/07 20:07:00
OS_CHROMEOS implies OS_LINUX.
In this mess of ifd
rjkroege
2016/11/07 23:01:22
OK.
Can I persuade you to make this easier to r
Tom (Use chromium acct)
2016/11/07 23:21:03
Done. Also I realized I forgot to 'git add' the r
|
+#if defined(USE_OZONE) |
+ NOTIMPLEMENTED(); |
+#else |
ui_controls::InstallUIControlsAura( |
views::test::CreateUIControlsDesktopAura()); |
+#endif // defined(USE_OZONE) |
#else |
// TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. |
ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL)); |
-#endif |
-#endif |
+#endif // defined(OS_LINUX) |
+#endif // defined(USE_AURA) |
} |
void Shutdown() override { |