Ozone Linux: Fix linker errors in interactive_ui_tests

chrome/test/base/interactive_ui_tests_main.cc

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)

[tonikitoo, 2016/11/08 15:44:56]

maybe we can omit OS_LINUX, as USE_X11 implies it.

[Tom (Use chromium acct), 2016/11/08 18:21:48]

Done.

 #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)
+#if defined(USE_OZONE)
+    NOTIMPLEMENTED();
+#else
     ui_controls::InstallUIControlsAura(

[tonikitoo, 2016/11/08 15:44:56]

ui_controls::InstallUIControlsAura is declared/defined
ui/views/test/ui_controls_factory_desktop_aurax11.h/cc

Maybe should rename it in a follow up to ui_controls::InstallUIControlsAuraX11 ?

[Tom (Use chromium acct), 2016/11/08 18:21:48]

I was thinking the same thing actually..
But I agree this would be better for a separate CL

         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 {